From ea9ceb17bdf4ea4acf28dca84508b62bd7e94fd4 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Mon, 7 Sep 2015 01:42:31 +0200
Subject: Ported inter-server.conf to libconfig

Ported to modern Hercules and cleaned up from Panikon's commits: 40f9ec33868e2240cab013308897898ed252b3e0, a9d646da19e25ab6fcf44dbd1ae7d90c30f6686c, 1aa8581a0aecbfd53e877686c399ffb731dcd75e, 72c645b015ae6130ca7d4309d0fb1413340e7f23, f8c906a0496b9acdae1d8244b1544fa03592061e, 51d88a58983c9552dfd1a0f059e5a031742aed61, 443684b3c77f4c32fe7877a7f8d62debf73b1e93, cf93eafef1f322cd1583226272b7d4008f562da4

Signed-off-by: Haru <haru@dotalux.com>
---
 src/map/map.c        | 174 +++++++++++++++++++++++++++++++++++----------------
 src/map/map.h        |   7 ++-
 src/map/mapreg.h     |   6 +-
 src/map/mapreg_sql.c |  21 ++++---
 4 files changed, 142 insertions(+), 66 deletions(-)

(limited to 'src/map')

diff --git a/src/map/map.c b/src/map/map.c
index d6425b94e..56af8113b 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3997,63 +3997,125 @@ void map_reloadnpc(bool clear) {
 	}
 }
 
-int inter_config_read(char *cfgName) {
-	char line[1024],w1[1024],w2[1024];
-	FILE *fp;
+/**
+ * Reads inter-server.conf and initializes required variables.
+ *
+ * @param filename Path to configuration file
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool inter_config_read(const char *filename, bool imported)
+{
+	struct config_t config;
+	const struct config_setting_t *setting = NULL;
+	const char *import = NULL;
+	bool retval = true;
 
-	nullpo_retr(1, cfgName);
-	if (!(fp = fopen(cfgName,"r"))) {
-		ShowError("File not found: %s\n",cfgName);
-		return 1;
+	nullpo_retr(false, filename);
+
+	if (!libconfig->load_file(&config, filename))
+		return false;
+
+	if ((setting = libconfig->lookup(&config, "inter_configuration")) == NULL) {
+		libconfig->destroy(&config);
+		if (imported)
+			return true;
+		ShowError("inter_config_read: inter_configuration was not found in %s!\n", filename);
+		return false;
 	}
-	while (fgets(line, sizeof(line), fp)) {
-		if (line[0] == '/' && line[1] == '/')
-			continue;
 
-		if (sscanf(line,"%1023[^:]: %1023[^\r\n]", w1, w2) < 2)
-			continue;
-		/* map sql stuff */
-		if(strcmpi(w1,"map_server_ip")==0)
-			safestrncpy(map->server_ip, w2, sizeof(map->server_ip));
-		else if(strcmpi(w1,"map_server_port")==0)
-			map->server_port=atoi(w2);
-		else if(strcmpi(w1,"map_server_id")==0)
-			safestrncpy(map->server_id, w2, sizeof(map->server_id));
-		else if(strcmpi(w1,"map_server_pw")==0)
-			safestrncpy(map->server_pw, w2, sizeof(map->server_pw));
-		else if(strcmpi(w1,"map_server_db")==0)
-			safestrncpy(map->server_db, w2, sizeof(map->server_db));
-		else if(strcmpi(w1,"default_codepage")==0)
-			safestrncpy(map->default_codepage, w2, sizeof(map->default_codepage));
-		else if(strcmpi(w1,"autotrade_merchants_db")==0)
-			safestrncpy(map->autotrade_merchants_db, w2, sizeof(map->autotrade_merchants_db));
-		else if(strcmpi(w1,"autotrade_data_db")==0)
-			safestrncpy(map->autotrade_data_db, w2, sizeof(map->autotrade_data_db));
-		else if(strcmpi(w1,"npc_market_data_db")==0)
-			safestrncpy(map->npc_market_data_db, w2, sizeof(map->npc_market_data_db));
-		/* sql log db */
-		else if(strcmpi(w1,"log_db_ip")==0)
-			safestrncpy(logs->db_ip, w2, sizeof(logs->db_ip));
-		else if(strcmpi(w1,"log_db_id")==0)
-			safestrncpy(logs->db_id, w2, sizeof(logs->db_id));
-		else if(strcmpi(w1,"log_db_pw")==0)
-			safestrncpy(logs->db_pw, w2, sizeof(logs->db_pw));
-		else if(strcmpi(w1,"log_db_port")==0)
-			logs->db_port = atoi(w2);
-		else if(strcmpi(w1,"log_db_db")==0)
-			safestrncpy(logs->db_name, w2, sizeof(logs->db_name));
-		/* mapreg */
-		else if( mapreg->config_read(w1,w2) )
-			continue;
-		/* import */
-		else if(strcmpi(w1,"import")==0)
-			map->inter_config_read(w2);
-		else
-			HPM->parseConf(w1, w2, HPCT_MAP_INTER);
+	if (!map->inter_config_read_database_names(filename, &config, imported))
+		retval = false;
+	if (!map->inter_config_read_connection(filename, &config, imported))
+		retval = false;
+
+	// TODO HPM->parseConf(w1, w2, HPCT_MAP_INTER);
+
+	// import should overwrite any previous configuration, so it should be called last
+	if (libconfig->lookup_string(&config, "import", &import) == CONFIG_TRUE) {
+		if (strcmp(import, filename) == 0 || strcmp(import, map->INTER_CONF_NAME) == 0) {
+			ShowWarning("inter_config_read: Loop detected in %s! Skipping 'import'...\n", filename);
+		} else {
+			if (!map->inter_config_read(import, true))
+				retval = false;
+		}
 	}
-	fclose(fp);
 
-	return 0;
+	libconfig->destroy(&config);
+	return retval;
+}
+
+/**
+ * Reads the 'inter_configuration/log/sql_connection' config entry and initializes required variables.
+ *
+ * @param filename Path to configuration file (used in error and warning messages).
+ * @param config   The current config being parsed.
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool inter_config_read_connection(const char *filename, const struct config_t *config, bool imported)
+{
+	const struct config_setting_t *setting = NULL;
+
+	nullpo_retr(false, filename);
+	nullpo_retr(false, config);
+
+	if ((setting = libconfig->lookup(config, "inter_configuration/log/sql_connection")) == NULL) {
+		if (imported)
+			return true;
+		ShowError("inter_config_read: inter_configuration/log/sql_connection was not found in %s!\n", filename);
+		return false;
+	}
+
+	libconfig->setting_lookup_int(setting, "port", &logs->db_port);
+	libconfig->setting_lookup_mutable_string(setting, "db_hostname", logs->db_ip, sizeof(logs->db_ip));
+	libconfig->setting_lookup_mutable_string(setting, "db_username", logs->db_id, sizeof(logs->db_id));
+	libconfig->setting_lookup_mutable_string(setting, "db_password", logs->db_pw, sizeof(logs->db_pw));
+	libconfig->setting_lookup_mutable_string(setting, "db_database", logs->db_name, sizeof(logs->db_name));
+
+	return true;
+}
+
+/**
+ * Reads the 'inter_configuration/database_names' config entry and initializes required variables.
+ *
+ * @param filename Path to configuration file (used in error and warning messages).
+ * @param config   The current config being parsed.
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool inter_config_read_database_names(const char *filename, const struct config_t *config, bool imported)
+{
+	const struct config_setting_t *setting = NULL;
+	bool retval = true;
+
+	nullpo_retr(false, filename);
+	nullpo_retr(false, config);
+
+	if ((setting = libconfig->lookup(config, "inter_configuration/database_names")) == NULL) {
+		if (imported)
+			return true;
+		ShowError("inter_config_read: inter_configuration/database_names was not found in %s!\n", filename);
+		return false;
+	}
+
+	libconfig->setting_lookup_mutable_string(setting, "autotrade_merchants_db", map->autotrade_merchants_db, sizeof(map->autotrade_merchants_db));
+	libconfig->setting_lookup_mutable_string(setting, "autotrade_data_db", map->autotrade_data_db, sizeof(map->autotrade_data_db));
+	libconfig->setting_lookup_mutable_string(setting, "npc_market_data_db", map->npc_market_data_db, sizeof(map->npc_market_data_db));
+
+	if (!mapreg->config_read(filename, setting, imported))
+		retval = false;
+
+	if ((setting = libconfig->lookup(config, "inter_configuration/database_names/registry")) == NULL) {
+		if (imported)
+			return retval;
+		ShowError("inter_config_read: inter_configuration/database_names/registry was not found in %s!\n", filename);
+		return false;
+	}
+	return retval;
 }
 
 /*=======================================
@@ -6077,7 +6139,7 @@ int do_init(int argc, char *argv[])
 
 	map_load_defaults();
 
-	map->INTER_CONF_NAME         = aStrdup("conf/inter-server.conf");
+	map->INTER_CONF_NAME         = aStrdup("conf/common/inter-server.conf");
 	map->LOG_CONF_NAME           = aStrdup("conf/logs.conf");
 	map->MAP_CONF_NAME           = aStrdup("conf/map-server.conf");
 	map->BATTLE_CONF_FILENAME    = aStrdup("conf/battle.conf");
@@ -6128,7 +6190,7 @@ int do_init(int argc, char *argv[])
 
 		battle->config_read(map->BATTLE_CONF_FILENAME);
 		atcommand->msg_read(map->MSG_CONF_NAME, false);
-		map->inter_config_read(map->INTER_CONF_NAME);
+		map->inter_config_read(map->INTER_CONF_NAME, false);
 		logs->config_read(map->LOG_CONF_NAME);
 	}
 	script->config_read(map->SCRIPT_CONF_NAME);
@@ -6288,7 +6350,7 @@ void map_defaults(void) {
 	map->night_flag = 0; // 0=day, 1=night [Yor]
 	map->enable_spy = 0; //To enable/disable @spy commands, which consume too much cpu time when sending packets. [Skotlex]
 
-	map->INTER_CONF_NAME="conf/inter-server.conf";
+	map->INTER_CONF_NAME="conf/common/inter-server.conf";
 	map->LOG_CONF_NAME="conf/logs.conf";
 	map->MAP_CONF_NAME = "conf/map-server.conf";
 	map->BATTLE_CONF_FILENAME = "conf/battle.conf";
@@ -6502,6 +6564,8 @@ void map_defaults(void) {
 	map->config_read_sub = map_config_read_sub;
 	map->reloadnpc_sub = map_reloadnpc_sub;
 	map->inter_config_read = inter_config_read;
+	map->inter_config_read_database_names = inter_config_read_database_names;
+	map->inter_config_read_connection = inter_config_read_connection;
 	map->sql_init = map_sql_init;
 	map->sql_close = map_sql_close;
 	map->zone_mf_cache = map_zone_mf_cache;
diff --git a/src/map/map.h b/src/map/map.h
index dbd30febf..f98e1cb7f 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2012-2015  Hercules Dev Team
+ * Copyright (C) 2012-2016  Hercules Dev Team
  * Copyright (C)  Athena Dev Teams
  *
  * Hercules is free software: you can redistribute it and/or modify
@@ -33,6 +33,7 @@
 
 /* Forward Declarations */
 struct Sql; // common/sql.h
+struct config_t; // common/conf.h
 struct mob_data;
 struct npc_data;
 struct channel_data;
@@ -1190,7 +1191,9 @@ END_ZEROED_BLOCK;
 	int (*config_read) (char *cfgName);
 	int (*config_read_sub) (char *cfgName);
 	void (*reloadnpc_sub) (char *cfgName);
-	int (*inter_config_read) (char *cfgName);
+	bool (*inter_config_read) (const char *filename, bool imported);
+	bool (*inter_config_read_database_names) (const char *filename, const struct config_t *config, bool imported);
+	bool (*inter_config_read_connection) (const char *filename, const struct config_t *config, bool imported);
 	int (*sql_init) (void);
 	int (*sql_close) (void);
 	bool (*zone_mf_cache) (int m, char *flag, char *params);
diff --git a/src/map/mapreg.h b/src/map/mapreg.h
index d19b2bb80..642bce48e 100644
--- a/src/map/mapreg.h
+++ b/src/map/mapreg.h
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2012-2015  Hercules Dev Team
+ * Copyright (C) 2012-2016  Hercules Dev Team
  * Copyright (C)  Athena Dev Teams
  *
  * Hercules is free software: you can redistribute it and/or modify
@@ -25,6 +25,8 @@
 #include "common/hercules.h"
 #include "common/db.h"
 
+/* Forward Declarations */
+struct config_setting_t; // common/conf.h
 struct eri;
 
 /** Container for a mapreg value */
@@ -61,7 +63,7 @@ struct mapreg_interface {
 	int (*save_timer) (int tid, int64 tick, int id, intptr_t data);
 	int (*destroyreg) (union DBKey key, struct DBData *data, va_list ap);
 	void (*reload) (void);
-	bool (*config_read) (const char *w1, const char *w2);
+	bool (*config_read) (const char *filename, const struct config_setting_t *config, bool imported);
 };
 
 #ifdef HERCULES_CORE
diff --git a/src/map/mapreg_sql.c b/src/map/mapreg_sql.c
index 82ce39d64..4cdb91b21 100644
--- a/src/map/mapreg_sql.c
+++ b/src/map/mapreg_sql.c
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2012-2015  Hercules Dev Team
+ * Copyright (C) 2012-2016  Hercules Dev Team
  * Copyright (C)  Athena Dev Teams
  *
  * Hercules is free software: you can redistribute it and/or modify
@@ -25,6 +25,7 @@
 #include "map/map.h" // map-"mysql_handle
 #include "map/script.h"
 #include "common/cbasetypes.h"
+#include "common/conf.h"
 #include "common/db.h"
 #include "common/ers.h"
 #include "common/memmgr.h"
@@ -349,13 +350,19 @@ void mapreg_init(void) {
 
 /**
  * Loads the mapreg configuration file.
+ *
+ * @param filename Path to configuration file (used in error and warning messages).
+ * @param config   The current config being parsed.
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
  */
-bool mapreg_config_read(const char* w1, const char* w2) {
-	nullpo_retr(false, w1);
-	nullpo_retr(false, w2);
-	if(!strcmpi(w1, "mapreg_db"))
-		safestrncpy(mapreg->table, w2, sizeof(mapreg->table));
-	else
+bool mapreg_config_read(const char *filename, const struct config_setting_t *config, bool imported)
+{
+	nullpo_retr(false, filename);
+	nullpo_retr(false, config);
+
+	if (libconfig->setting_lookup_mutable_string(config, "mapreg_db", mapreg->table, sizeof(mapreg->table)) != CONFIG_TRUE)
 		return false;
 
 	return true;
-- 
cgit v1.2.3-70-g09d2


From 85d10885379bbe52930c233f02bf1c94ec86ac30 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Thu, 11 Feb 2016 13:28:18 +0100
Subject: Ported map-server.conf to libconfig

Ported to modern Hercules and cleaned up from Panikon's commits: ee48838b12d15902fc14738cfa46d58b39080d11, 55498ebb7ac5d28444d0b01506c88ef6874f6055, 6d1f8f50b0e7349bdab2c53bb172d0b036e47c04, 25dde7e46524ace330b83cb4bf0255cc4d796792

Signed-off-by: Haru <haru@dotalux.com>
---
 .gitignore                       |    1 -
 conf/atcommand.conf              |    2 +-
 conf/charhelp.txt                |   28 -
 conf/global/console.conf         |    8 +
 conf/help.txt                    |  307 ----------
 conf/import-tmpl/map-server.conf |   32 +
 conf/import-tmpl/map_conf.txt    |    0
 conf/map-server.conf             |  119 ----
 conf/map/charhelp.txt            |   28 +
 conf/map/help.txt                |  307 ++++++++++
 conf/map/map-server.conf         |  117 ++++
 conf/map/maps.conf               | 1252 ++++++++++++++++++++++++++++++++++++++
 conf/maps.conf                   | 1225 -------------------------------------
 src/map/map.c                    |  449 ++++++++++----
 src/map/map.h                    |    7 +-
 tools/configconverter.pl         |   35 +-
 16 files changed, 2111 insertions(+), 1806 deletions(-)
 delete mode 100644 conf/charhelp.txt
 delete mode 100644 conf/help.txt
 create mode 100644 conf/import-tmpl/map-server.conf
 delete mode 100644 conf/import-tmpl/map_conf.txt
 delete mode 100644 conf/map-server.conf
 create mode 100644 conf/map/charhelp.txt
 create mode 100644 conf/map/help.txt
 create mode 100644 conf/map/map-server.conf
 create mode 100644 conf/map/maps.conf
 delete mode 100644 conf/maps.conf

(limited to 'src/map')

diff --git a/.gitignore b/.gitignore
index bd33fac60..eaf7a3aa3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,6 @@ Thumbs.db
 /conf/import/*.conf
 /conf/import/battle_conf.txt
 /conf/import/log_conf.txt
-/conf/import/map_conf.txt
 /conf/import/msg_conf.txt
 /conf/import/packet_conf.txt
 /conf/import/script_conf.txt
diff --git a/conf/atcommand.conf b/conf/atcommand.conf
index df4972067..175286eb0 100644
--- a/conf/atcommand.conf
+++ b/conf/atcommand.conf
@@ -68,5 +68,5 @@ nolog: {
 
 /* Commands help file */
 help: {
-	@include "conf/help.txt"
+	@include "conf/map/help.txt"
 }
diff --git a/conf/charhelp.txt b/conf/charhelp.txt
deleted file mode 100644
index e3acddbb4..000000000
--- a/conf/charhelp.txt
+++ /dev/null
@@ -1,28 +0,0 @@
- 40:--- CHARACTER CMD ---
- 40:#statsall <char name> - Set all stats of a player to maximum.
- 40:#itemlist <char name> - Displays all items of a player.
- 40:#storagelist <char name> - Displays all items of a player's storage.
- 40:#stats <char name> - Displays a characters stats.
- 60:#option <char name> <param1> <param2> <param3> - Like @option command but only to target character.
- 50:#mountpeco <char name> - Give/remove to a player a peco (Class is required, but not skill).
- 50:#petrename <char name> - Re-enable pet rename to a player.
- 60:#save <char name> <map> <x> <y> - Changes the target players respawn point.
- 60:#baselvl/#blvl <char name> <#> - Change a characters base level.
- 60:#joblvl/#jlvl <char name> <#> - Change a characters job level.
- 60:#job/#jobchange <char name> <job ID> - Changes target characters job.
- 60:#zeny <char name> <amount> - Give/take a players Zeny
- 60:#cash <char name> <amount> - Give/take a player cash points
- 60:#points <char name> <amount> - Give/take a player Kafra points
- 60:#stpoint <char name> <amount> - Give/take a players stat points
- 60:#skpoint <char name> <amount> - give/take a players skill points
- 60:#skreset <char name> - Reset skills of a character.
- 60:#streset <char name> - Reset stats of a character.
- 60:#reset <char name> - Reset stats AND skills of a character.
- 60:#questskill <char name> <#> - Gives to a player the specified quest skill.
- 60:#lostskill <char name> <#> - Takes away the specified quest skill from the player.
- 60:#delitem <char name> <item_name_or_ID> <quantity> - Remove items from a character
- 50:#model <char name> <hair type> <hair color> <clothes color> - Changes a player's model
- 60:#disguise <char name> <monster_name_or_monster_ID> - Changes disguise of a player
- 60:#undisguise <char name> - Cancels disguise of a player
- 60:#changesex <char name> - Changes sex of a player (all characters of the account)
- 60:#warp/#rura+ <char name> <mapname> <x> <y> - Warps character to location of choice
diff --git a/conf/global/console.conf b/conf/global/console.conf
index d26c48352..21ee46bd0 100644
--- a/conf/global/console.conf
+++ b/conf/global/console.conf
@@ -56,4 +56,12 @@ console: {
 
 	// [CHAR] Display information on the console whenever characters/guilds/parties/pets are loaded/saved?
 	save_log: true
+
+	// [MAP] Makes server log selected message types to a file in the /log/ folder
+	//1: Log Warning Messages
+	//2: Log Error and SQL Error messages.
+	//4: Log Debug Messages
+	//Example: "console_msg_log: 7" logs all 3 kinds
+	//Messages logged by this overrides console_silent setting
+	console_msg_log: 0
 }
diff --git a/conf/help.txt b/conf/help.txt
deleted file mode 100644
index a65c7de70..000000000
--- a/conf/help.txt
+++ /dev/null
@@ -1,307 +0,0 @@
-// This is help file that contains help messages for atcommands/charcommands.
-
-// Format:
-// <command>: "<help message>"
-
-// This file uses libconfig syntax.
-
-help: "Params: <command>\n" "Shows help for specified command."
-noask: "Auto rejects deals/invites."
-me: "Params: <message>\n" "Displays normal text as a message in this format: *name message* (like /me in mIRC)."
-fakename: "Params: <name>\n" "Changes your name to your choice temporarily."
-npctalk: "Params: <NPC name> <message>\n" "Forces a NPC to display a message in normal chat."
-broadcast: "Params: <message>\n" "Broadcasts a message with your name (in yellow)."
-kami: "Params: <message>\n" "Broadcasts a message without your name (in yellow)."
-kamib: "Params: <message>\n" "Broadcasts a message without your name (in blue)."
-localbroadcast: "Params: <message>\n" "Broadcasts a message with your name (in yellow) only on your map."
-commands: "Displays a list of commands that you can use."
-rates: "Displays the server's current rates."
-uptime: "Displays how long the server has been online."
-showdelay: "Shows/hides the \"There is a delay after this skill\" message."
-exp: "Displays current levels and % progress."
-mobinfo: "Params: <monster name|ID>\n" "Shows monster info (stats, exp, drops etc)."
-iteminfo: "Params: <item name|ID>\n" "Shows item info (type, price etc)."
-whodrops: "Params: <item name|ID>\n" "Shows who drops an item (monster with highest drop rates)."
-version: "Displays SVN version of the server."
-email: "Params: <current email> <new email>\n" "Changes your account e-mail address."
-where: "Params: <char name>\n" "Tells you the location of a character."
-time: "Shows the date and time of the server."
-showexp: "Displays/hides experience gained."
-showzeny: "Displays/hides Zeny gained."
-mobsearch: "Params: <monster name|ID>\n" "Shows the location of a certain mob on the current map."
-who: "Params: [<name>]\n" "Shows a list of online players and their party and guild."
-who2: "Params: [<name>]\n" "Shows a list of online players and their job."
-who3: "Params: [<name>]\n" "Shows a list of online players and their location."
-whomap: "@whomap/@whomap2/@whomap3 [map] - like @who/@who2/@who3 but only for specified map."
-whogm: "Params: [match_text] - Like @who+@who2+who3, but only for GM."
-guildspy: "Params: <guild name|id> - You will receive all messages of the guild channel (Chat logging must be enabled)"
-partyspy: "@partyspy <party name|id> - You will receive all messages of the party channel (Chat logging must be enabled)"
-mapinfo: "Params: [<0-3> [map]] - Give information about a map (general info +: 0: no more, 1: players, 2: NPC, 3: shops/chat)."
-go: "Params: <city name|number>\n" "Warps you to a city.\n"
-	"  -3: (Memo point 2)  14: louyang         31: mora\n"
-	"  -2: (Memo point 1)  15: start point     32: dewata\n"
-	"  -1: (Memo point 0)  16: prison/jail     33: malangdo island\n"
-	"   0: prontera              17: jawaii             34: malaya port\n"
-	"   1: morocc                18: ayothaya       35: eclage\n"
-	"   2: geffen                  19: einbroch\n"
-	"   3: payon                  20: lighthalzen\n"
-	"   4: alberta                 21: einbech\n"
-	"   5: izlude                   22: hugel\n"
-	"   6: aldebaran           23: rachel\n"
-	"   7: xmas (lutie)        24: veins\n"
-	"   8: comodo               25: moscovia\n"
-	"   9: yuno                     26: midgard camp\n"
-	"  10: amatsu               27: manuk\n"
-	"  11: gonryun              28: splendide\n"
-	"  12: umbala               29: brasilis\n"
-	"  13: niflheim              30: el dicastes\n"
-jumpto: "Params: <char name>\n" "Warps you to selected character."
-follow: "Params: <char name>\n" "Follow a player."
-mount: "Give/remove you a peco (Class is required, but not skill)"
-disguise: "Params: <monster name|ID>\n" "Change your appearence to other players to a mob."
-undisguise: "Restore your normal appearance."
-disguiseguild: "Disguises all online characters of a guild."
-undisguiseguild: "Restore the normal appearance of all characters of a guild."
-model: "Params:  <hair ID: 0-17> <hair color: 0-8> <clothes color: 0-4> - Changes your characters appearence."
-size: "Params:  <1-3> Changes your size (1-Smallest 2-Biggest 3-Normal)"
-sizeall: "Changes the size of all players."
-sizeguild: "Changes the size of all online characters of a guild."
-hide: "Makes you character invisible (GM invisibility). Type again to become visible."
-save: "Sets respawn point to current spot."
-load: "Warps you to your save point."
-warp: "Params: <mapname> [<x> <y>]\n" "Warps you to the selected map and position."
-jump: "Params: [<x> [<y>]]\n" "Randomly warps you like a flywing."
-jobchange: "Params: <job name|ID>\n" "Changes your job.\n"
-	"----- Novice / 1st Class -----\n"
-	"   0 Novice              1 Swordman            2 Magician            3 Archer\n"
-	"   4 Acolyte              5 Merchant               6 Thief\n"
-	"----- 2nd Class -----\n"
-	"   7 Knight               8 Priest                     9 Wizard               10 Blacksmith\n"
-	"  11 Hunter           12 Assassin            14 Crusader          15 Monk\n"
-	"  16 Sage              17 Rogue                 18 Alchemist         19 Bard\n"
-	"  20 Dancer\n"
-	"----- High Novice / High 1st Class -----\n"
-	"4001 Novice High     4002 Swordman High    4003 Magician High    4004 Archer High\n"
-	"4005 Acolyte High     4006 Merchant High       4007 Thief High\n"
-	"----- Transcendent 2nd Class -----\n"
-	"4008 Lord Knight      4009 High Priest             4010 High Wizard      4011 Whitesmith\n"
-	"4012 Sniper               4013 Assassin Cross   4015 Paladin              4016 Champion\n"
-	"4017 Professor         4018 Stalker                    4019 Creator               4020 Clown\n"
-	"4021 Gypsy\n"
-	"----- 3rd Class (Regular) -----\n"
-	"4054 Rune Knight    4055 Warlock                 4056 Ranger            4057 Arch Bishop\n"
-	"4058 Mechanic         4059 Guillotine Cross  4066 Royal Guard   4067 Sorcerer\n"
-	"4068 Minstrel            4069 Wanderer              4070 Sura                 4071 Genetic\n"
-	"4072 Shadow Chaser\n"
-	"----- 3rd Class (Transcendent) -----\n"
-	"4060 Rune Knight    4061 Warlock                 4062 Ranger             4063 Arch Bishop\n"
-	"4064 Mechanic         4065 Guillotine Cross  4073 Royal Guard    4074 Sorcerer\n"
-	"4075 Minstrel            4076 Wanderer              4077 Sura                  4078 Genetic\n"
-	"4079 Shadow Chaser\n"
-	"----- Expanded Class -----\n"
-	"     23 Super Novice      24 Gunslinger              25 Ninja                 4045 Super Baby\n"
-	"4046 Taekwon           4047 Star Gladiator     4049 Soul Linker            4050 Gangsi\n"
-	"4051 Death Knight    4052 Dark Collector    4190 Ex. Super Novice  4191 Ex. Super Baby\n"
-	"4211 Kagerou            4212 Oboro            4215 Rebellion\n"
-	"----- Baby Novice And Baby 1st Class -----\n"
-	"4023 Baby Novice      4024 Baby Swordman    4025 Baby Magician   4026 Baby Archer\n"
-	"4027 Baby Acolyte      4028 Baby Merchant       4029 Baby Thief\n"
-	"---- Baby 2nd Class ----\n"
-	"4030 Baby Knight     4031 Baby Priest         4032 Baby Wizard         4033 Baby Blacksmith\n"
-	"4034 Baby Hunter    4035 Baby Assassin   4037 Baby Crusader    4038 Baby Monk\n"
-	"4039 Baby Sage       4040 Baby Rogue        4041 Baby Alchemist   4042 Baby Bard\n"
-	"4043 Baby Dancer\n"
-	"---- Baby 3rd Class ----\n"
-	"4096 Baby Rune Knight  4097 Baby Warlock     4098 Baby Ranger           4099 Baby Arch Bishop\n"
-	"4100 Baby Mechanic       4101 Baby Glt. Cross  4102 Baby Royal Guard  4103 Baby Sorcerer\n"
-	"4104 Baby Minstrel          4105 Baby Wanderer   4106 Baby Sura             4107 Baby Genetic\n"
-	"4108 Baby Shadow Chaser\n"
-	"---- Modes And Others ----\n"
-	" 22 Wedding            26 Christmas          27 Summer           4048 Star Gladiator (Union)\n"
-option: "Params: <param1> <param2>(stackable) <param3>(stackable)\n" "Adds different visual effects on or around your character.\n"
-" <param1>       <param2>        <param3>\n"
-"01: Stone      01: Sight       01: Sight          512: Cart Lv. 4\n"
-"02: Frozen     02: Curse       02: Hiding        1024: Cart Lv. 5\n"
-"03: Stun       04: Silence     04: Cloaking      2048: Orc Head\n"
-"04: Sleep      08: Signum      08: Cart Lv. 1    4096: Wedding\n"
-"06: Petrify    16: Blind       16: Falcon        8192: Ruwach\n"
-"07: Burning    32: Angelus     32: Riding       16384: Chasewalk\n"
-"08: Imprison   64: Bleeding    64: Invisible\n"
-"16: (Nothing) 128: D. Poison  128: Cart Lv. 2\n"
-"32: (Nothing) 256: Fear       256: Cart Lv. 3"
-heal: "Params: [<HP> <SP>]\n" "Heals the desired amount of HP and SP. No value specified will do a full heal."
-dye: "Params: <clothes palette no.>\n" "Changes your characters clothes color."
-hairstyle: "Params: <hairstyle no.>\n" "Changes your hair style."
-haircolor: "Params <hair palette no.>\n" "Changes your hair color."
-speed: "Params: <1-1000>\n" "Changes you walking speed. 1 being the fastest and 1000 the slowest. Default is 150."
-effect: "Params: <effect id> [<flag>]\n" "Give an effect to your character."
-dropall: "Throws all your possession on the ground."
-storeall: "Puts all your possessions in storage."
-killable: "Make your character killable."
-memo: "Params: [memo position]\n" "Set/change a memo location (no position: display memo points)."
-spiritball: "Params: <1-100>\n" "Gives you \"spirit spheres\" like from the skill \"Call Spirits\".\n"
-questskill: "Params: <#>\n" "Gives you the specified quest skill\n"
-"Novice = 142: First Aid, 143: Act Dead\n"
-"Archer = 147: Create Arrow, 148: Charge Arrow\n"
-"Swordman = 144: Moving HP Recovery, 145: Attack Weak Point, 146: Auto Berserk\n"
-"Acolyte = 156: Holy Light\n"
-"Thief = 149: Throw Sand, 150: Back Sliding, 151: Take Stone, 152: Throw Stone\n"
-"Merchant = 153: Cart Revolution, 154: Change Cart, 155: Crazy Uproar, 2535: Open Buying Store\n"
-"Magician = 157: Energy Coat\n"
-"Hunter = 1009: Phantasmic Arrow\n"
-"Bard = 1010: Pang Voice\n"
-"Dancer = 1011: Wink of Charm\n"
-"Knight = 1001: Charge Attack\n"
-"Crusader = 1002: Shrink\n"
-"Priest = 1014: Redemptio\n"
-"Monk = 1015: Ki Translation, 1016: Ki Explosio\n"
-"Assassin = 1003: Sonic Acceleration, 1004: Throw Venom Knife\n"
-"Rogue = 1005: Close Confine\n"
-"Blacksmith = 1012: Unfair Trick, 1013: Greed\n"
-"Alchemist = 238: Basis of Life\n"
-"Wizard = 1006: Sight Blaster\n"
-"Sage = 1007: Create Elemental Converter, 1008: Elemental Change (Water), 1017: Elemental Change (Earth), 1018: Elemental Change (Fire), 1019: Elemental Change (Wind)"
-lostskill: "Params: <#>\n" "Takes away the specified quest skill from you\n"
-"Novice = 142: First Aid, 143: Act Dead\n"
-"Archer = 147: Create Arrow, 148: Charge Arrow\n"
-"Swordman = 144: Moving HP Recovery, 145: Attack Weak Point, 146: Auto Berserk\n"
-"Acolyte = 156: Holy Light\n"
-"Thief = 149: Throw Sand, 150: Back Sliding, 151: Take Stone, 152: Throw Stone\n"
-"Merchant = 153: Cart Revolution, 154: Change Cart, 155: Crazy Uproar, 2535: Open Buying Store\n"
-"Magician = 157: Energy Coat\n"
-"Hunter = 1009: Phantasmic Arrow\n"
-"Bard = 1010: Pang Voice\n"
-"Dancer = 1011: Wink of Charm\n"
-"Knight = 1001: Charge Attack\n"
-"Crusader = 1002: Shrink\n"
-"Priest = 1014: Redemptio\n"
-"Monk = 1015: Ki Translation, 1016: Ki Explosio\n"
-"Assassin = 1003: Sonic Acceleration, 1004: Throw Venom Knife\n"
-"Rogue = 1005: Close Confine\n"
-"Blacksmith = 1012: Unfair Trick, 1013: Greed\n"
-"Alchemist = 238: Basis of Life\n"
-"Wizard = 1006: Sight Blaster\n"
-"Sage = 1007: Create Elemental Converter, 1008: Elemental Change (Water), 1017: Elemental Change (Earth), 1018: Elemental Change (Fire), 1019: Elemental Change (Wind)"
-skillid: "Params: <name>\n" "Look up a skill by name"
-useskill: "Params: <skillid> <skillv> <target>\n" "Use a skill on target"
-skilltree: "Params: <skillnum> <charname>\n" "Prints the skill tree needed to get a skill for the target player."
-marry: "Params: <player name>\n" "Marry another player."
-divorce: "Divorce player."
-alive: "Revives yourself from death."
-blvl: "Params: <number of levels>\n" "Raises your base level the desired number of levels."
-jlvl: "Params: <number of levels>\n" "Raises your job level the desired number of levels."
-allskill: "Give you all skills."
-stpoint: "Params: <number of points> - Gives you the desired number of stat points."
-skpoint: "Params: <number of points> - Gives you the desired number of skill points."
-zeny: "Params: <amount> - Gives you desired amount of Zeny."
-cash: "Params: <amount> - Gives you the specified amount of cash points."
-points: "Params: <amount> - Gives you the specified amount of Kafra Points."
-str: "Params: <amount>\n" "Raises STR by given amount."
-agi: "Params: <amount>\n" "Raises AGI by given amount."
-dex: "Params: <amount>\n" "Raises DEX by given amount."
-vit: "Params: <amount>\n" "Raises VIT by given amount."
-int: "Params: <amount>\n" "Raises INT by given amount."
-luk: "Params: <amount>\n" "Raises LUK by given amount."
-allstats: "Params: <value>\n" "Adds value in all stats (maximum if no value)."
-addwarp: "Params: <map name> <x coord> <y coord>\n"
-killmonster2: "Kills all monsters of your map (without drops)."
-monster: "Params: <monster name|ID> [<number to spawn> [<desired_monster_name> [<x coord> [<y coord>]]]]\n"
- "@monster2 <desired_monster_name> <monster name|ID> [<number to spawn> [<x coord> [<y coord>]]]\n"
-"@spawn/@monster/@summon/@monster2 \"desired monster name\" <monster name|ID> [<number to spawn> [<x coord> [<y coord>]]]\n"
-"@spawn/@monster/@summon/@monster2 <monster name|ID> \"desired monster name\" [<number to spawn> [<x coord> [<y coord>]]]\n"
-"	Spawns the desired monster with any desired name."
-monstersmall: "Params: <monster name|ID>\n" "Spawns a smaller version of a monster."
-monsterbig: "Params: <monster name|ID>\n" "Spawns a larger version of a monster."
-killmonster: "Params: <map>\n" "Kill all monsters of the map (they drop)"
-autoloot: "Params: <on|off|#>\n" "Makes items go straight into your inventory."
-autotrade: "Allows you to vend while you are offline."
-changegm: "Params: <charname>\n" "Changes the leader of your guild (You must be guild leader)"
-changeleader: "Params: <charname>\n" "Changes the leader of your party (You must be party leader)"
-request: "Params: <message>\n" "Sends a message to all connected GMs (via the gm whisper system)"
-sound: "Params: <path to file in data folder or GRF file>\n" "Plays a sound from the data folder or GRF file located on the client."
-clone: "Params: <charname>\n" "Spawns a supportive clone of the given player."
-slaveclone: "Params: <charname>\n" "Spawns a supportive clone of the given player that follows the creator around."
-evilclone: "Params: <charname>\n" "Spawns an aggressive clone of the given player."
-changesex: "Changes your gender."
-duel: "Starts a duel."
-invite: "Invites a player to a duel."
-accept: "Accepts an invitation to a duel."
-reject: "Rejects an invitation to a duel."
-leave: "Leaves a duel."
-mail: "Open mail box."
-storage: "Opens storage."
-itemreset: "Remove all your items."
-guildstorage: "Opens guild storage."
-idsearch: "Params: <part_of_item_name>\n" "Search all items that name have part_of_item_name"
-refine: "Params: <equip position> <+/- amount>"
-produce: "Params: <equip name or equip ID> <element> <# of very's>\n"
-"	Element: 0=None 1=Ice 2=Earth 3=Fire 4=Wind\n"
-"	You can add up to 3 Star Crumbs and 1 element\n"
-repairall: "Repair all items of your inventory"
-item: "Params: <item name or ID> <quantity>\n" "Gives you the desired item."
-item2: "Params: <item name or ID> <quantity> <identified_flag> <refine> <broken_flag> <Card1> <Card2> <Card3> <Card4>\n" "Gives you the desired item."
-pvpon: "Turns pvp on on the current map"
-pvpoff: "Turns pvp off on the current map"
-gvgon: "Turns gvg on on the current map"
-gvgoff: "Turns gvg off on the current map"
-agitstart: "Starts War of Emperium"
-agitend: "End War of Emperium"
-party: "Params: <party_name>\n" "Create a party."
-guild: "Params: <guild_name>\n" "Create a guild."
-glvl: "Params: <# of levels>\n" "Raise Guild by desired number of levels"
-guildrecall: "Params: <guild name|ID>\n" "Warps all online characters of a guild to you."
-partyrecall: "Params: <party name|ID>\n" "Warps all online characters of a party to you."
-petrename: "Re-enable pet rename"
-pettalk: "Params: <message>\n" "Makes your pet say a message."
-petfriendly: "Params: <#>\n" "Set pet friendly amount (0-1000) 1000 = Max"
-pethungry: "Params: <#>\n" "Set pet hungry amount (0-100) 100 = Max"
-hatch: "Create a pet from your inventory eggs list."
-makeegg: "Params: <pet_id>\n" "Gives pet egg for monster number in pet DB"
-kick: "Params: <char name>\n" "Kicks specified character off the server"
-unjail: "Params: <char name>\n" "Discharges specified character/prisoner"
-kill: "Params: <char name>\n" "Kills player."
-recall: "Params: <char name>\n" "Warps target character to you."
-raise: "Params: <char name>\n" "Revives target character."
-block: "Params: <char name>\n" "Permanently blocks an account."
-unblock: "Params: <char name>\n" "Unblocks an account."
-ban: "Params: <time> <name>\n" "Temporarily ban an account.\n"
- "	time usage: adjustment (+/- value) and element (y/a, m, d/j, h, mn, s)\n"
- "	Example: @ban +1m-2mn1s-6y testplayer\n"
-unban: "Params: <name> - Unban a account"
-jail: "Params: <char name> - Sends specified character in jails"
-trade: "Params: <char name> - Open a trade window with a another player"
-recallall: "Warps every character online to you."
-doom: "Kills all NON GM chars on the server."
-doommap: "Kills all non GM characters on the map."
-raisemap: "Resurrects all characters on the map."
-night: "Enables night mode on all maps, all characters are affected."
-day: "Disables night mode and restores regular lighting, all characters are affected."
-skillon: "turn skills on for a map"
-skilloff: "turn skills on for a map"
-snow: "Makes all maps to have the snow weather effect."
-clouds: "Makes all maps to have the cloudy weather effect."
-clouds2: "Makes all maps to have another cloudy weather effect."
-fog: "Makes all maps to have the fog weather effect."
-fireworks: "Makes all maps to have the fireworks weather effect."
-sakura: "Makes all maps to have the sakura weather effect."
-leaves: "Makes all maps to have the leaves weather effect."
-shownpc: "Params: <NPC name>\n" "Enable a NPC"
-hidenpc: "Params: <NPC name>\n" "Disable a NPC"
-loadnpc: "Params: <path to script>\n" "Load the specified script file path."
-unloadnpc: "Params: <NPC name>\n" "Unload the specified NPC according to name."
-adjgroup: "Params: <level> <char name> - Do a temporary adjustment of the GM level of a player"
-kickall: "Kick all characters off the server"
-mapexit: "Kick all players and shut down map-server."
-reloaditemdb: "Reload item database."
-reloadmobdb: "Reload monster database."
-reloadquestdb: "Reload quest database."
-reloadskilldb: "Reload skills definition database."
-reloadscript: "Reload all scripts."
-gat: "For debugging (you inspect around gat)"
-send: "For debugging (packet variety)"
-nuke: "Params: <char name>\n" "Blow somebody up, including those surrounding them."
-autoloottype: "Manage a list of autolooting item types.\n"
-" To add an item type to the list, use \"@autoloottype +<type name>\".\n"
-" To remove an item type, use \"@autoloottype -<type name>\".\n"
-" Type List: healing, usable, etc, weapon, armor, card, petegg, petarmor, ammo.\n"
-" \"@autoloottype reset\" will clear your autoloottype list."
diff --git a/conf/import-tmpl/map-server.conf b/conf/import-tmpl/map-server.conf
new file mode 100644
index 000000000..2c9b16531
--- /dev/null
+++ b/conf/import-tmpl/map-server.conf
@@ -0,0 +1,32 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Map Server local configuration file.
+//=========================================================================
+
+map_configuration: {
+	// See conf/map/map-server.conf for details
+}
diff --git a/conf/import-tmpl/map_conf.txt b/conf/import-tmpl/map_conf.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/conf/map-server.conf b/conf/map-server.conf
deleted file mode 100644
index d0749e85e..000000000
--- a/conf/map-server.conf
+++ /dev/null
@@ -1,119 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Map-Server Configuration File
-//--------------------------------------------------------------
-
-// Note: "Comments" are all text on the right side of a double slash "//"
-// Whatever text is commented will not be parsed by the servers, and serves
-// only as information/reference.
-
-//--------------------------------------------------------------
-//                     Configuration Info
-//--------------------------------------------------------------
-// Interserver communication passwords, set in account.txt (or equiv.)
-userid: s1
-passwd: p1
-
-// Character Server IP
-// The map server connects to the character server using this IP address.
-// NOTE: This is useful when you are running behind a firewall or are on
-// a machine with multiple interfaces.
-//char_ip: 127.0.0.1
-
-// The map server listens on the interface with this IP address.
-// NOTE: This allows you to run multiple servers on multiple interfaces
-// while using the same ports for each server.
-//bind_ip: 127.0.0.1
-
-// Character Server Port
-char_port: 6121
-
-// Map Server IP
-// The IP address which clients will use to connect.
-// Set this to what your server's public IP address is.
-//map_ip: 127.0.0.1
-
-// Map Server Port
-map_port: 5121
-
-//Time-stamp format which will be printed before all messages.
-//Can at most be 20 characters long.
-//Common formats:
-// %I:%M:%S %p (hour:minute:second 12 hour, AM/PM format)
-// %H:%M:%S (hour:minute:second, 24 hour format)
-// %d/%b/%Y (day/Month/year)
-//For full format information, consult the strftime() manual.
-//timestamp_format: [%d/%b %H:%M]
-
-//If redirected output contains escape sequences (color codes)
-stdout_with_ansisequence: no
-
-//Makes server log selected message types to a file in the /log/ folder
-//1: Log Warning Messages
-//2: Log Error and SQL Error messages.
-//4: Log Debug Messages
-//Example: "console_msg_log: 7" logs all 3 kinds
-//Messages logged by this overrides console_silent setting
-console_msg_log: 0
-
-//Makes server output more silent by omitting certain types of messages:
-//1: Hide Information messages
-//2: Hide Status messages
-//4: Hide Notice Messages
-//8: Hide Warning Messages
-//16: Hide Error and SQL Error messages.
-//32: Hide Debug Messages
-//Example: "console_silent: 7" Hides information, status and notice messages (1+2+4)
-console_silent: 0
-
-//Where should all database data be read from?
-db_path: db
-
-// Enable the @guildspy and @partyspy at commands?
-// Note that enabling them decreases packet sending performance.
-enable_spy: no
-
-// Read map data from GATs and RSWs in GRF files or a data directory
-// as referenced by grf-files.txt rather than from the mapcache?
-use_grf: no
-
-// Database autosave time
-// All characters are saved on this time in seconds (example:
-// autosave of 60 secs with 60 characters online -> one char is saved every
-// second)
-autosave_time: 300
-
-// Min database save intervals (in ms)
-// Prevent saving characters faster than at this rate (prevents char-server
-// save-load getting too high as character-count increases)
-minsave_time: 100
-
-// Apart from the autosave_time, players will also get saved when involved
-// in the following (add as needed):
-// 1: After every successful trade
-// 2: After every vending transaction
-// 4: After closing storage/guild storage.
-// 8: After hatching/returning to egg a pet.
-// 16: After successfully sending a mail with attachment
-// 32: After successfully submitting an item for auction
-// 64: After successfully get/delete/complete a quest
-// 128: After every buying store transaction
-// 256: After every bank transaction (deposit/withdraw)
-// NOTE: These settings decrease the chance of dupes/lost items when there's a
-// server crash at the expense of increasing the map/char server lag. If your
-// server rarely crashes, but experiences interserver lag, you may want to set
-// these off.
-save_settings: 511
-
-//When employing more than one language (see db/translations.conf),
-//this setting is used as a fallback
-default_language: English
-
-// 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
-help2_txt: conf/help2.txt
-charhelp_txt: conf/charhelp.txt
-
-// Maps:
-import: conf/maps.conf
-
-import: conf/import/map_conf.txt
diff --git a/conf/map/charhelp.txt b/conf/map/charhelp.txt
new file mode 100644
index 000000000..e3acddbb4
--- /dev/null
+++ b/conf/map/charhelp.txt
@@ -0,0 +1,28 @@
+ 40:--- CHARACTER CMD ---
+ 40:#statsall <char name> - Set all stats of a player to maximum.
+ 40:#itemlist <char name> - Displays all items of a player.
+ 40:#storagelist <char name> - Displays all items of a player's storage.
+ 40:#stats <char name> - Displays a characters stats.
+ 60:#option <char name> <param1> <param2> <param3> - Like @option command but only to target character.
+ 50:#mountpeco <char name> - Give/remove to a player a peco (Class is required, but not skill).
+ 50:#petrename <char name> - Re-enable pet rename to a player.
+ 60:#save <char name> <map> <x> <y> - Changes the target players respawn point.
+ 60:#baselvl/#blvl <char name> <#> - Change a characters base level.
+ 60:#joblvl/#jlvl <char name> <#> - Change a characters job level.
+ 60:#job/#jobchange <char name> <job ID> - Changes target characters job.
+ 60:#zeny <char name> <amount> - Give/take a players Zeny
+ 60:#cash <char name> <amount> - Give/take a player cash points
+ 60:#points <char name> <amount> - Give/take a player Kafra points
+ 60:#stpoint <char name> <amount> - Give/take a players stat points
+ 60:#skpoint <char name> <amount> - give/take a players skill points
+ 60:#skreset <char name> - Reset skills of a character.
+ 60:#streset <char name> - Reset stats of a character.
+ 60:#reset <char name> - Reset stats AND skills of a character.
+ 60:#questskill <char name> <#> - Gives to a player the specified quest skill.
+ 60:#lostskill <char name> <#> - Takes away the specified quest skill from the player.
+ 60:#delitem <char name> <item_name_or_ID> <quantity> - Remove items from a character
+ 50:#model <char name> <hair type> <hair color> <clothes color> - Changes a player's model
+ 60:#disguise <char name> <monster_name_or_monster_ID> - Changes disguise of a player
+ 60:#undisguise <char name> - Cancels disguise of a player
+ 60:#changesex <char name> - Changes sex of a player (all characters of the account)
+ 60:#warp/#rura+ <char name> <mapname> <x> <y> - Warps character to location of choice
diff --git a/conf/map/help.txt b/conf/map/help.txt
new file mode 100644
index 000000000..a65c7de70
--- /dev/null
+++ b/conf/map/help.txt
@@ -0,0 +1,307 @@
+// This is help file that contains help messages for atcommands/charcommands.
+
+// Format:
+// <command>: "<help message>"
+
+// This file uses libconfig syntax.
+
+help: "Params: <command>\n" "Shows help for specified command."
+noask: "Auto rejects deals/invites."
+me: "Params: <message>\n" "Displays normal text as a message in this format: *name message* (like /me in mIRC)."
+fakename: "Params: <name>\n" "Changes your name to your choice temporarily."
+npctalk: "Params: <NPC name> <message>\n" "Forces a NPC to display a message in normal chat."
+broadcast: "Params: <message>\n" "Broadcasts a message with your name (in yellow)."
+kami: "Params: <message>\n" "Broadcasts a message without your name (in yellow)."
+kamib: "Params: <message>\n" "Broadcasts a message without your name (in blue)."
+localbroadcast: "Params: <message>\n" "Broadcasts a message with your name (in yellow) only on your map."
+commands: "Displays a list of commands that you can use."
+rates: "Displays the server's current rates."
+uptime: "Displays how long the server has been online."
+showdelay: "Shows/hides the \"There is a delay after this skill\" message."
+exp: "Displays current levels and % progress."
+mobinfo: "Params: <monster name|ID>\n" "Shows monster info (stats, exp, drops etc)."
+iteminfo: "Params: <item name|ID>\n" "Shows item info (type, price etc)."
+whodrops: "Params: <item name|ID>\n" "Shows who drops an item (monster with highest drop rates)."
+version: "Displays SVN version of the server."
+email: "Params: <current email> <new email>\n" "Changes your account e-mail address."
+where: "Params: <char name>\n" "Tells you the location of a character."
+time: "Shows the date and time of the server."
+showexp: "Displays/hides experience gained."
+showzeny: "Displays/hides Zeny gained."
+mobsearch: "Params: <monster name|ID>\n" "Shows the location of a certain mob on the current map."
+who: "Params: [<name>]\n" "Shows a list of online players and their party and guild."
+who2: "Params: [<name>]\n" "Shows a list of online players and their job."
+who3: "Params: [<name>]\n" "Shows a list of online players and their location."
+whomap: "@whomap/@whomap2/@whomap3 [map] - like @who/@who2/@who3 but only for specified map."
+whogm: "Params: [match_text] - Like @who+@who2+who3, but only for GM."
+guildspy: "Params: <guild name|id> - You will receive all messages of the guild channel (Chat logging must be enabled)"
+partyspy: "@partyspy <party name|id> - You will receive all messages of the party channel (Chat logging must be enabled)"
+mapinfo: "Params: [<0-3> [map]] - Give information about a map (general info +: 0: no more, 1: players, 2: NPC, 3: shops/chat)."
+go: "Params: <city name|number>\n" "Warps you to a city.\n"
+	"  -3: (Memo point 2)  14: louyang         31: mora\n"
+	"  -2: (Memo point 1)  15: start point     32: dewata\n"
+	"  -1: (Memo point 0)  16: prison/jail     33: malangdo island\n"
+	"   0: prontera              17: jawaii             34: malaya port\n"
+	"   1: morocc                18: ayothaya       35: eclage\n"
+	"   2: geffen                  19: einbroch\n"
+	"   3: payon                  20: lighthalzen\n"
+	"   4: alberta                 21: einbech\n"
+	"   5: izlude                   22: hugel\n"
+	"   6: aldebaran           23: rachel\n"
+	"   7: xmas (lutie)        24: veins\n"
+	"   8: comodo               25: moscovia\n"
+	"   9: yuno                     26: midgard camp\n"
+	"  10: amatsu               27: manuk\n"
+	"  11: gonryun              28: splendide\n"
+	"  12: umbala               29: brasilis\n"
+	"  13: niflheim              30: el dicastes\n"
+jumpto: "Params: <char name>\n" "Warps you to selected character."
+follow: "Params: <char name>\n" "Follow a player."
+mount: "Give/remove you a peco (Class is required, but not skill)"
+disguise: "Params: <monster name|ID>\n" "Change your appearence to other players to a mob."
+undisguise: "Restore your normal appearance."
+disguiseguild: "Disguises all online characters of a guild."
+undisguiseguild: "Restore the normal appearance of all characters of a guild."
+model: "Params:  <hair ID: 0-17> <hair color: 0-8> <clothes color: 0-4> - Changes your characters appearence."
+size: "Params:  <1-3> Changes your size (1-Smallest 2-Biggest 3-Normal)"
+sizeall: "Changes the size of all players."
+sizeguild: "Changes the size of all online characters of a guild."
+hide: "Makes you character invisible (GM invisibility). Type again to become visible."
+save: "Sets respawn point to current spot."
+load: "Warps you to your save point."
+warp: "Params: <mapname> [<x> <y>]\n" "Warps you to the selected map and position."
+jump: "Params: [<x> [<y>]]\n" "Randomly warps you like a flywing."
+jobchange: "Params: <job name|ID>\n" "Changes your job.\n"
+	"----- Novice / 1st Class -----\n"
+	"   0 Novice              1 Swordman            2 Magician            3 Archer\n"
+	"   4 Acolyte              5 Merchant               6 Thief\n"
+	"----- 2nd Class -----\n"
+	"   7 Knight               8 Priest                     9 Wizard               10 Blacksmith\n"
+	"  11 Hunter           12 Assassin            14 Crusader          15 Monk\n"
+	"  16 Sage              17 Rogue                 18 Alchemist         19 Bard\n"
+	"  20 Dancer\n"
+	"----- High Novice / High 1st Class -----\n"
+	"4001 Novice High     4002 Swordman High    4003 Magician High    4004 Archer High\n"
+	"4005 Acolyte High     4006 Merchant High       4007 Thief High\n"
+	"----- Transcendent 2nd Class -----\n"
+	"4008 Lord Knight      4009 High Priest             4010 High Wizard      4011 Whitesmith\n"
+	"4012 Sniper               4013 Assassin Cross   4015 Paladin              4016 Champion\n"
+	"4017 Professor         4018 Stalker                    4019 Creator               4020 Clown\n"
+	"4021 Gypsy\n"
+	"----- 3rd Class (Regular) -----\n"
+	"4054 Rune Knight    4055 Warlock                 4056 Ranger            4057 Arch Bishop\n"
+	"4058 Mechanic         4059 Guillotine Cross  4066 Royal Guard   4067 Sorcerer\n"
+	"4068 Minstrel            4069 Wanderer              4070 Sura                 4071 Genetic\n"
+	"4072 Shadow Chaser\n"
+	"----- 3rd Class (Transcendent) -----\n"
+	"4060 Rune Knight    4061 Warlock                 4062 Ranger             4063 Arch Bishop\n"
+	"4064 Mechanic         4065 Guillotine Cross  4073 Royal Guard    4074 Sorcerer\n"
+	"4075 Minstrel            4076 Wanderer              4077 Sura                  4078 Genetic\n"
+	"4079 Shadow Chaser\n"
+	"----- Expanded Class -----\n"
+	"     23 Super Novice      24 Gunslinger              25 Ninja                 4045 Super Baby\n"
+	"4046 Taekwon           4047 Star Gladiator     4049 Soul Linker            4050 Gangsi\n"
+	"4051 Death Knight    4052 Dark Collector    4190 Ex. Super Novice  4191 Ex. Super Baby\n"
+	"4211 Kagerou            4212 Oboro            4215 Rebellion\n"
+	"----- Baby Novice And Baby 1st Class -----\n"
+	"4023 Baby Novice      4024 Baby Swordman    4025 Baby Magician   4026 Baby Archer\n"
+	"4027 Baby Acolyte      4028 Baby Merchant       4029 Baby Thief\n"
+	"---- Baby 2nd Class ----\n"
+	"4030 Baby Knight     4031 Baby Priest         4032 Baby Wizard         4033 Baby Blacksmith\n"
+	"4034 Baby Hunter    4035 Baby Assassin   4037 Baby Crusader    4038 Baby Monk\n"
+	"4039 Baby Sage       4040 Baby Rogue        4041 Baby Alchemist   4042 Baby Bard\n"
+	"4043 Baby Dancer\n"
+	"---- Baby 3rd Class ----\n"
+	"4096 Baby Rune Knight  4097 Baby Warlock     4098 Baby Ranger           4099 Baby Arch Bishop\n"
+	"4100 Baby Mechanic       4101 Baby Glt. Cross  4102 Baby Royal Guard  4103 Baby Sorcerer\n"
+	"4104 Baby Minstrel          4105 Baby Wanderer   4106 Baby Sura             4107 Baby Genetic\n"
+	"4108 Baby Shadow Chaser\n"
+	"---- Modes And Others ----\n"
+	" 22 Wedding            26 Christmas          27 Summer           4048 Star Gladiator (Union)\n"
+option: "Params: <param1> <param2>(stackable) <param3>(stackable)\n" "Adds different visual effects on or around your character.\n"
+" <param1>       <param2>        <param3>\n"
+"01: Stone      01: Sight       01: Sight          512: Cart Lv. 4\n"
+"02: Frozen     02: Curse       02: Hiding        1024: Cart Lv. 5\n"
+"03: Stun       04: Silence     04: Cloaking      2048: Orc Head\n"
+"04: Sleep      08: Signum      08: Cart Lv. 1    4096: Wedding\n"
+"06: Petrify    16: Blind       16: Falcon        8192: Ruwach\n"
+"07: Burning    32: Angelus     32: Riding       16384: Chasewalk\n"
+"08: Imprison   64: Bleeding    64: Invisible\n"
+"16: (Nothing) 128: D. Poison  128: Cart Lv. 2\n"
+"32: (Nothing) 256: Fear       256: Cart Lv. 3"
+heal: "Params: [<HP> <SP>]\n" "Heals the desired amount of HP and SP. No value specified will do a full heal."
+dye: "Params: <clothes palette no.>\n" "Changes your characters clothes color."
+hairstyle: "Params: <hairstyle no.>\n" "Changes your hair style."
+haircolor: "Params <hair palette no.>\n" "Changes your hair color."
+speed: "Params: <1-1000>\n" "Changes you walking speed. 1 being the fastest and 1000 the slowest. Default is 150."
+effect: "Params: <effect id> [<flag>]\n" "Give an effect to your character."
+dropall: "Throws all your possession on the ground."
+storeall: "Puts all your possessions in storage."
+killable: "Make your character killable."
+memo: "Params: [memo position]\n" "Set/change a memo location (no position: display memo points)."
+spiritball: "Params: <1-100>\n" "Gives you \"spirit spheres\" like from the skill \"Call Spirits\".\n"
+questskill: "Params: <#>\n" "Gives you the specified quest skill\n"
+"Novice = 142: First Aid, 143: Act Dead\n"
+"Archer = 147: Create Arrow, 148: Charge Arrow\n"
+"Swordman = 144: Moving HP Recovery, 145: Attack Weak Point, 146: Auto Berserk\n"
+"Acolyte = 156: Holy Light\n"
+"Thief = 149: Throw Sand, 150: Back Sliding, 151: Take Stone, 152: Throw Stone\n"
+"Merchant = 153: Cart Revolution, 154: Change Cart, 155: Crazy Uproar, 2535: Open Buying Store\n"
+"Magician = 157: Energy Coat\n"
+"Hunter = 1009: Phantasmic Arrow\n"
+"Bard = 1010: Pang Voice\n"
+"Dancer = 1011: Wink of Charm\n"
+"Knight = 1001: Charge Attack\n"
+"Crusader = 1002: Shrink\n"
+"Priest = 1014: Redemptio\n"
+"Monk = 1015: Ki Translation, 1016: Ki Explosio\n"
+"Assassin = 1003: Sonic Acceleration, 1004: Throw Venom Knife\n"
+"Rogue = 1005: Close Confine\n"
+"Blacksmith = 1012: Unfair Trick, 1013: Greed\n"
+"Alchemist = 238: Basis of Life\n"
+"Wizard = 1006: Sight Blaster\n"
+"Sage = 1007: Create Elemental Converter, 1008: Elemental Change (Water), 1017: Elemental Change (Earth), 1018: Elemental Change (Fire), 1019: Elemental Change (Wind)"
+lostskill: "Params: <#>\n" "Takes away the specified quest skill from you\n"
+"Novice = 142: First Aid, 143: Act Dead\n"
+"Archer = 147: Create Arrow, 148: Charge Arrow\n"
+"Swordman = 144: Moving HP Recovery, 145: Attack Weak Point, 146: Auto Berserk\n"
+"Acolyte = 156: Holy Light\n"
+"Thief = 149: Throw Sand, 150: Back Sliding, 151: Take Stone, 152: Throw Stone\n"
+"Merchant = 153: Cart Revolution, 154: Change Cart, 155: Crazy Uproar, 2535: Open Buying Store\n"
+"Magician = 157: Energy Coat\n"
+"Hunter = 1009: Phantasmic Arrow\n"
+"Bard = 1010: Pang Voice\n"
+"Dancer = 1011: Wink of Charm\n"
+"Knight = 1001: Charge Attack\n"
+"Crusader = 1002: Shrink\n"
+"Priest = 1014: Redemptio\n"
+"Monk = 1015: Ki Translation, 1016: Ki Explosio\n"
+"Assassin = 1003: Sonic Acceleration, 1004: Throw Venom Knife\n"
+"Rogue = 1005: Close Confine\n"
+"Blacksmith = 1012: Unfair Trick, 1013: Greed\n"
+"Alchemist = 238: Basis of Life\n"
+"Wizard = 1006: Sight Blaster\n"
+"Sage = 1007: Create Elemental Converter, 1008: Elemental Change (Water), 1017: Elemental Change (Earth), 1018: Elemental Change (Fire), 1019: Elemental Change (Wind)"
+skillid: "Params: <name>\n" "Look up a skill by name"
+useskill: "Params: <skillid> <skillv> <target>\n" "Use a skill on target"
+skilltree: "Params: <skillnum> <charname>\n" "Prints the skill tree needed to get a skill for the target player."
+marry: "Params: <player name>\n" "Marry another player."
+divorce: "Divorce player."
+alive: "Revives yourself from death."
+blvl: "Params: <number of levels>\n" "Raises your base level the desired number of levels."
+jlvl: "Params: <number of levels>\n" "Raises your job level the desired number of levels."
+allskill: "Give you all skills."
+stpoint: "Params: <number of points> - Gives you the desired number of stat points."
+skpoint: "Params: <number of points> - Gives you the desired number of skill points."
+zeny: "Params: <amount> - Gives you desired amount of Zeny."
+cash: "Params: <amount> - Gives you the specified amount of cash points."
+points: "Params: <amount> - Gives you the specified amount of Kafra Points."
+str: "Params: <amount>\n" "Raises STR by given amount."
+agi: "Params: <amount>\n" "Raises AGI by given amount."
+dex: "Params: <amount>\n" "Raises DEX by given amount."
+vit: "Params: <amount>\n" "Raises VIT by given amount."
+int: "Params: <amount>\n" "Raises INT by given amount."
+luk: "Params: <amount>\n" "Raises LUK by given amount."
+allstats: "Params: <value>\n" "Adds value in all stats (maximum if no value)."
+addwarp: "Params: <map name> <x coord> <y coord>\n"
+killmonster2: "Kills all monsters of your map (without drops)."
+monster: "Params: <monster name|ID> [<number to spawn> [<desired_monster_name> [<x coord> [<y coord>]]]]\n"
+ "@monster2 <desired_monster_name> <monster name|ID> [<number to spawn> [<x coord> [<y coord>]]]\n"
+"@spawn/@monster/@summon/@monster2 \"desired monster name\" <monster name|ID> [<number to spawn> [<x coord> [<y coord>]]]\n"
+"@spawn/@monster/@summon/@monster2 <monster name|ID> \"desired monster name\" [<number to spawn> [<x coord> [<y coord>]]]\n"
+"	Spawns the desired monster with any desired name."
+monstersmall: "Params: <monster name|ID>\n" "Spawns a smaller version of a monster."
+monsterbig: "Params: <monster name|ID>\n" "Spawns a larger version of a monster."
+killmonster: "Params: <map>\n" "Kill all monsters of the map (they drop)"
+autoloot: "Params: <on|off|#>\n" "Makes items go straight into your inventory."
+autotrade: "Allows you to vend while you are offline."
+changegm: "Params: <charname>\n" "Changes the leader of your guild (You must be guild leader)"
+changeleader: "Params: <charname>\n" "Changes the leader of your party (You must be party leader)"
+request: "Params: <message>\n" "Sends a message to all connected GMs (via the gm whisper system)"
+sound: "Params: <path to file in data folder or GRF file>\n" "Plays a sound from the data folder or GRF file located on the client."
+clone: "Params: <charname>\n" "Spawns a supportive clone of the given player."
+slaveclone: "Params: <charname>\n" "Spawns a supportive clone of the given player that follows the creator around."
+evilclone: "Params: <charname>\n" "Spawns an aggressive clone of the given player."
+changesex: "Changes your gender."
+duel: "Starts a duel."
+invite: "Invites a player to a duel."
+accept: "Accepts an invitation to a duel."
+reject: "Rejects an invitation to a duel."
+leave: "Leaves a duel."
+mail: "Open mail box."
+storage: "Opens storage."
+itemreset: "Remove all your items."
+guildstorage: "Opens guild storage."
+idsearch: "Params: <part_of_item_name>\n" "Search all items that name have part_of_item_name"
+refine: "Params: <equip position> <+/- amount>"
+produce: "Params: <equip name or equip ID> <element> <# of very's>\n"
+"	Element: 0=None 1=Ice 2=Earth 3=Fire 4=Wind\n"
+"	You can add up to 3 Star Crumbs and 1 element\n"
+repairall: "Repair all items of your inventory"
+item: "Params: <item name or ID> <quantity>\n" "Gives you the desired item."
+item2: "Params: <item name or ID> <quantity> <identified_flag> <refine> <broken_flag> <Card1> <Card2> <Card3> <Card4>\n" "Gives you the desired item."
+pvpon: "Turns pvp on on the current map"
+pvpoff: "Turns pvp off on the current map"
+gvgon: "Turns gvg on on the current map"
+gvgoff: "Turns gvg off on the current map"
+agitstart: "Starts War of Emperium"
+agitend: "End War of Emperium"
+party: "Params: <party_name>\n" "Create a party."
+guild: "Params: <guild_name>\n" "Create a guild."
+glvl: "Params: <# of levels>\n" "Raise Guild by desired number of levels"
+guildrecall: "Params: <guild name|ID>\n" "Warps all online characters of a guild to you."
+partyrecall: "Params: <party name|ID>\n" "Warps all online characters of a party to you."
+petrename: "Re-enable pet rename"
+pettalk: "Params: <message>\n" "Makes your pet say a message."
+petfriendly: "Params: <#>\n" "Set pet friendly amount (0-1000) 1000 = Max"
+pethungry: "Params: <#>\n" "Set pet hungry amount (0-100) 100 = Max"
+hatch: "Create a pet from your inventory eggs list."
+makeegg: "Params: <pet_id>\n" "Gives pet egg for monster number in pet DB"
+kick: "Params: <char name>\n" "Kicks specified character off the server"
+unjail: "Params: <char name>\n" "Discharges specified character/prisoner"
+kill: "Params: <char name>\n" "Kills player."
+recall: "Params: <char name>\n" "Warps target character to you."
+raise: "Params: <char name>\n" "Revives target character."
+block: "Params: <char name>\n" "Permanently blocks an account."
+unblock: "Params: <char name>\n" "Unblocks an account."
+ban: "Params: <time> <name>\n" "Temporarily ban an account.\n"
+ "	time usage: adjustment (+/- value) and element (y/a, m, d/j, h, mn, s)\n"
+ "	Example: @ban +1m-2mn1s-6y testplayer\n"
+unban: "Params: <name> - Unban a account"
+jail: "Params: <char name> - Sends specified character in jails"
+trade: "Params: <char name> - Open a trade window with a another player"
+recallall: "Warps every character online to you."
+doom: "Kills all NON GM chars on the server."
+doommap: "Kills all non GM characters on the map."
+raisemap: "Resurrects all characters on the map."
+night: "Enables night mode on all maps, all characters are affected."
+day: "Disables night mode and restores regular lighting, all characters are affected."
+skillon: "turn skills on for a map"
+skilloff: "turn skills on for a map"
+snow: "Makes all maps to have the snow weather effect."
+clouds: "Makes all maps to have the cloudy weather effect."
+clouds2: "Makes all maps to have another cloudy weather effect."
+fog: "Makes all maps to have the fog weather effect."
+fireworks: "Makes all maps to have the fireworks weather effect."
+sakura: "Makes all maps to have the sakura weather effect."
+leaves: "Makes all maps to have the leaves weather effect."
+shownpc: "Params: <NPC name>\n" "Enable a NPC"
+hidenpc: "Params: <NPC name>\n" "Disable a NPC"
+loadnpc: "Params: <path to script>\n" "Load the specified script file path."
+unloadnpc: "Params: <NPC name>\n" "Unload the specified NPC according to name."
+adjgroup: "Params: <level> <char name> - Do a temporary adjustment of the GM level of a player"
+kickall: "Kick all characters off the server"
+mapexit: "Kick all players and shut down map-server."
+reloaditemdb: "Reload item database."
+reloadmobdb: "Reload monster database."
+reloadquestdb: "Reload quest database."
+reloadskilldb: "Reload skills definition database."
+reloadscript: "Reload all scripts."
+gat: "For debugging (you inspect around gat)"
+send: "For debugging (packet variety)"
+nuke: "Params: <char name>\n" "Blow somebody up, including those surrounding them."
+autoloottype: "Manage a list of autolooting item types.\n"
+" To add an item type to the list, use \"@autoloottype +<type name>\".\n"
+" To remove an item type, use \"@autoloottype -<type name>\".\n"
+" Type List: healing, usable, etc, weapon, armor, card, petegg, petarmor, ammo.\n"
+" \"@autoloottype reset\" will clear your autoloottype list."
diff --git a/conf/map/map-server.conf b/conf/map/map-server.conf
new file mode 100644
index 000000000..b489e948b
--- /dev/null
+++ b/conf/map/map-server.conf
@@ -0,0 +1,117 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Map Server Configuration File
+//=========================================================================
+
+map_configuration: {
+	@include "conf/global/console.conf"
+	@include "conf/global/sql_connection.conf"
+
+	// map_list and map_removed
+	@include "conf/map/maps.conf"
+
+	// When @help or @h is typed when you are a gm, this is displayed for helping new gms understand gm commands.
+	help_txt: "conf/map/help.txt"
+	charhelp_txt: "conf/map/charhelp.txt"
+
+	// Enable the @guildspy and @partyspy at commands?
+	// Note that enabling them decreases packet sending performance.
+	enable_spy: false
+
+	// Read map data from GATs and RSWs in GRF files or a data directory
+	// as referenced by grf-files.txt rather than from the mapcache?
+	use_grf: false
+
+	// When employing more than one language (see db/translations.conf),
+	// this setting is used as a fallback
+	default_language: "English"
+
+	// Information related to inter-server behavior
+	inter: {
+		// Interserver communication passwords, set in the login server database
+		userid: "s1"
+		passwd: "p1"
+
+		// Character Server IP
+		// The map server connects to the character server using this IP address.
+		// NOTE: This is useful when you are running behind a firewall or are on
+		// a machine with multiple interfaces.
+		//char_ip: "127.0.0.1"
+
+		// The map server listens on the interface with this IP address.
+		// NOTE: This allows you to run multiple servers on multiple interfaces
+		// while using the same ports for each server.
+		//bind_ip: "127.0.0.1"
+
+		// Character Server Port
+		char_port: 6121
+
+		// Map Server IP
+		// The IP address which clients will use to connect.
+		// Set this to what your server's public IP address is.
+		//map_ip: "127.0.0.1"
+
+		// Map Server Port
+		map_port: 5121
+	}
+
+	database: {
+		// Where should all database data be read from?
+		db_path: "db"
+
+		// Database autosave time
+		// All characters are saved on this time in seconds (example:
+		// autosave of 60 secs with 60 characters online -> one char is
+		// saved every second)
+		autosave_time: 300
+
+		// Min database save intervals (in ms)
+		// Prevent saving characters faster than at this rate (prevents
+		// char-server save-load getting too high as character-count
+		// increases)
+		minsave_time: 100
+
+		// Apart from the autosave_time, players will also get saved
+		// when involved in the following (add as needed):
+		// 0x001: After every successful trade
+		// 0x002: After every vending transaction
+		// 0x004: After closing storage/guild storage.
+		// 0x008: After hatching/returning to egg a pet.
+		// 0x010: After successfully sending a mail with attachment
+		// 0x020: After successfully submitting an item for auction
+		// 0x040: After successfully get/delete/complete a quest
+		// 0x080: After every buying store transaction
+		// 0x100: After every bank transaction (deposit/withdraw)
+		// NOTE: These settings decrease the chance of dupes/lost items
+		// when there's a server crash at the expense of increasing the
+		// map/char server lag. If your server rarely crashes, but
+		// experiences interserver lag, you may want to set these off.
+		save_settings: 0x1ff
+	}
+}
+
+import: "conf/import/map-server.conf"
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
new file mode 100644
index 000000000..dc4798354
--- /dev/null
+++ b/conf/map/maps.conf
@@ -0,0 +1,1252 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Hercules map configuration file.
+//=========================================================================
+// Used to know which maps are currently being supported by Hercules
+//=========================================================================
+
+// Maps that are in map_list but are not supported by your server
+map_removed: (
+	//"mapname",
+)
+
+// Added maps
+map_list: (
+	//------------------------- Normal Maps ---------------------------
+	"alb_ship",
+	"alb2trea",
+	"alberta",
+	"alberta_in",
+	"alde_dun01",
+	"alde_dun02",
+	"alde_dun03",
+	"alde_dun04",
+	"aldeba_in",
+	"aldebaran",
+	"anthell01",
+	"anthell02",
+	"arena_room",
+	"c_tower1",
+	"c_tower2",
+	"c_tower3",
+	"c_tower4",
+	//"force_map1",
+	//"force_map2",
+	//"force_map3",
+	"force_1-1",
+	"force_2-1",
+	"force_3-1",
+	"force_4-1",
+	"force_5-1",
+	"force_1-2",
+	"force_2-2",
+	"force_3-2",
+	"force_1-3",
+	"force_2-3",
+	"force_3-3",
+	"gef_dun00",
+	"gef_dun01",
+	"gef_dun02",
+	"gef_dun03",
+	"gef_fild00",
+	"gef_fild01",
+	"gef_fild02",
+	"gef_fild03",
+	"gef_fild04",
+	"gef_fild05",
+	"gef_fild06",
+	"gef_fild07",
+	"gef_fild08",
+	"gef_fild09",
+	"gef_fild10",
+	"gef_fild11",
+	"gef_fild12",
+	"gef_fild13",
+	"gef_fild14",
+	"gef_tower",
+	"geffen",
+	"geffen_in",
+	"gl_cas01",
+	"gl_cas02",
+	"gl_church",
+	"gl_chyard",
+	"gl_dun01",
+	"gl_dun02",
+	"gl_in01",
+	"gl_knt01",
+	"gl_knt02",
+	"gl_prison",
+	"gl_prison1",
+	"gl_sew01",
+	"gl_sew02",
+	"gl_sew03",
+	"gl_sew04",
+	"gl_step",
+	"glast_01",
+	//"hunter_1-1",
+	//"hunter_2-1",
+	//"hunter_3-1",
+	"in_hunter",
+	"in_moc_16",
+	"in_orcs01",
+	"in_sphinx1",
+	"in_sphinx2",
+	"in_sphinx3",
+	"in_sphinx4",
+	"in_sphinx5",
+	"iz_dun00",
+	"iz_dun01",
+	"iz_dun02",
+	"iz_dun03",
+	"iz_dun04",
+	"izlu2dun",
+	"izlude",
+	"izlude_in",
+	"job_thief1",
+	//"knight_1-1",
+	//"knight_2-1",
+	//"knight_3-1",
+	"mjo_dun01",
+	"mjo_dun02",
+	"mjo_dun03",
+	"mjolnir_01",
+	"mjolnir_02",
+	"mjolnir_03",
+	"mjolnir_04",
+	"mjolnir_05",
+	"mjolnir_06",
+	"mjolnir_07",
+	"mjolnir_08",
+	"mjolnir_09",
+	"mjolnir_10",
+	"mjolnir_11",
+	"mjolnir_12",
+	"moc_castle",
+	"moc_fild01",
+	"moc_fild02",
+	"moc_fild03",
+	//"moc_fild04",
+	//"moc_fild05",
+	//"moc_fild06",
+	"moc_fild07",
+	//"moc_fild08",
+	//"moc_fild09",
+	//"moc_fild10",
+	"moc_fild11",
+	"moc_fild12",
+	"moc_fild13",
+	//"moc_fild14",
+	//"moc_fild15",
+	"moc_fild16",
+	"moc_fild17",
+	"moc_fild18",
+	"moc_fild19",
+	"moc_pryd01",
+	"moc_pryd02",
+	"moc_pryd03",
+	"moc_pryd04",
+	"moc_pryd05",
+	"moc_pryd06",
+	"moc_prydb1",
+	"moc_ruins",
+	"monk_in",
+	"morocc",
+	"morocc_in",
+	"new_zone01",
+	"new_zone02",
+	"new_zone03",
+	"new_zone04",
+	"new_1-1",
+	"new_1-2",
+	"new_1-3",
+	"new_1-4",
+	"new_2-1",
+	"new_2-2",
+	"new_2-3",
+	"new_2-4",
+	"new_3-1",
+	"new_3-2",
+	"new_3-3",
+	"new_3-4",
+	"new_4-1",
+	"new_4-2",
+	"new_4-3",
+	"new_4-4",
+	"new_5-1",
+	"new_5-2",
+	"new_5-3",
+	"new_5-4",
+	"orcsdun01",
+	"orcsdun02",
+	//"ordeal_a00",
+	//"ordeal_a02",
+	"ordeal_1-1",
+	"ordeal_1-2",
+	//"ordeal_1-3",
+	//"ordeal_1-4",
+	"ordeal_2-1",
+	"ordeal_2-2",
+	//"ordeal_2-3",
+	//"ordeal_2-4",
+	"ordeal_3-1",
+	"ordeal_3-2",
+	//"ordeal_3-3",
+	//"ordeal_3-4",
+	"pay_arche",
+	"pay_dun00",
+	"pay_dun01",
+	"pay_dun02",
+	"pay_dun03",
+	"pay_dun04",
+	"pay_fild01",
+	"pay_fild02",
+	"pay_fild03",
+	"pay_fild04",
+	"pay_fild05",
+	"pay_fild06",
+	"pay_fild07",
+	"pay_fild08",
+	"pay_fild09",
+	"pay_fild10",
+	"pay_fild11",
+	//"priest_1-1",
+	//"priest_2-1",
+	//"priest_3-1",
+	"prontera",
+	"prt_are_in",
+	"prt_are01",
+	"prt_castle",
+	"prt_church",
+	"prt_fild00",
+	"prt_fild01",
+	"prt_fild02",
+	"prt_fild03",
+	"prt_fild04",
+	"prt_fild05",
+	"prt_fild06",
+	"prt_fild07",
+	"prt_fild08",
+	"prt_fild09",
+	"prt_fild10",
+	"prt_fild11",
+	"prt_in",
+	"prt_maze01",
+	"prt_maze02",
+	"prt_maze03",
+	"prt_monk",
+	"prt_sewb1",
+	"prt_sewb2",
+	"prt_sewb3",
+	"prt_sewb4",
+	"pvp_room",
+	"pvp_2vs2",
+	"pvp_c_room",
+	"pvp_n_1-1",
+	"pvp_n_1-2",
+	"pvp_n_1-3",
+	"pvp_n_1-4",
+	"pvp_n_1-5",
+	"pvp_n_2-1",
+	"pvp_n_2-2",
+	"pvp_n_2-3",
+	"pvp_n_2-4",
+	"pvp_n_2-5",
+	"pvp_n_3-1",
+	"pvp_n_3-2",
+	"pvp_n_3-3",
+	"pvp_n_3-4",
+	"pvp_n_3-5",
+	"pvp_n_4-1",
+	"pvp_n_4-2",
+	"pvp_n_4-3",
+	"pvp_n_4-4",
+	"pvp_n_4-5",
+	"pvp_n_5-1",
+	"pvp_n_5-2",
+	"pvp_n_5-3",
+	"pvp_n_5-4",
+	"pvp_n_5-5",
+	"pvp_n_6-1",
+	"pvp_n_6-2",
+	"pvp_n_6-3",
+	"pvp_n_6-4",
+	"pvp_n_6-5",
+	"pvp_n_7-1",
+	"pvp_n_7-2",
+	"pvp_n_7-3",
+	"pvp_n_7-4",
+	"pvp_n_7-5",
+	"pvp_n_8-1",
+	"pvp_n_8-2",
+	"pvp_n_8-3",
+	"pvp_n_8-4",
+	"pvp_n_8-5",
+	"pvp_n_room",
+	"pvp_y_1-1",
+	"pvp_y_1-2",
+	"pvp_y_1-3",
+	"pvp_y_1-4",
+	"pvp_y_1-5",
+	"pvp_y_2-1",
+	"pvp_y_2-2",
+	"pvp_y_2-3",
+	"pvp_y_2-4",
+	"pvp_y_2-5",
+	"pvp_y_3-1",
+	"pvp_y_3-2",
+	"pvp_y_3-3",
+	"pvp_y_3-4",
+	"pvp_y_3-5",
+	"pvp_y_4-1",
+	"pvp_y_4-2",
+	"pvp_y_4-3",
+	"pvp_y_4-4",
+	"pvp_y_4-5",
+	"pvp_y_5-1",
+	"pvp_y_5-2",
+	"pvp_y_5-3",
+	"pvp_y_5-4",
+	"pvp_y_5-5",
+	"pvp_y_6-1",
+	"pvp_y_6-2",
+	"pvp_y_6-3",
+	"pvp_y_6-4",
+	"pvp_y_6-5",
+	"pvp_y_7-1",
+	"pvp_y_7-2",
+	"pvp_y_7-3",
+	"pvp_y_7-4",
+	"pvp_y_7-5",
+	"pvp_y_8-1",
+	"pvp_y_8-2",
+	"pvp_y_8-3",
+	"pvp_y_8-4",
+	"pvp_y_8-5",
+	"pvp_y_room",
+	"sword_1-1",
+	"sword_2-1",
+	"sword_3-1",
+	"treasure01",
+	"treasure02",
+	//"wizard_1-1",
+	//"wizard_2-1",
+	//"wizard_3-1",
+	"xmas",
+	"xmas_dun01",
+	"xmas_dun02",
+	"xmas_fild01",
+	"xmas_in",
+
+	//---Ep3.0 Comodo ---
+	"beach_dun",
+	"beach_dun2",
+	"beach_dun3",
+	"cmd_fild01",
+	"cmd_fild02",
+	"cmd_fild03",
+	"cmd_fild04",
+	"cmd_fild05",
+	"cmd_fild06",
+	"cmd_fild07",
+	"cmd_fild08",
+	"cmd_fild09",
+	"cmd_in01",
+	"cmd_in02",
+	"comodo",
+
+	//---EP3.1 Quiz Revolution ---
+	"quiz_00",
+	"quiz_01",
+	"g_room1-1",
+	"g_room1-2",
+	"g_room1-3",
+	"g_room2",
+
+	//--- Ep4.0 Turtle Island ---
+	"tur_dun01",
+	"tur_dun02",
+	"tur_dun03",
+	"tur_dun04",
+	"tur_dun05",
+	"tur_dun06",
+
+	//--- Ep4.1 The War of Emperium ---
+	"alde_gld",
+	"aldeg_cas01",
+	"aldeg_cas02",
+	"aldeg_cas03",
+	"aldeg_cas04",
+	"aldeg_cas05",
+	"gefg_cas01",
+	"gefg_cas02",
+	"gefg_cas03",
+	"gefg_cas04",
+	"gefg_cas05",
+	"gld_dun01",
+	"gld_dun02",
+	"gld_dun03",
+	"gld_dun04",
+	"guild_room",
+	"guild_vs1",
+	"guild_vs2",
+	"guild_vs3",
+	"guild_vs4",
+	"guild_vs5",
+	"guild_vs1-1",
+	"guild_vs1-2",
+	"guild_vs1-3",
+	"guild_vs1-4",
+	"guild_vs2-1",
+	"guild_vs2-2",
+	//"job_hunter",
+	"job_hunte",
+	//"job_knight",
+	"job_knt",
+	//"job_priest",
+	"job_prist",
+	"job_sword1",
+	//"job_wizard",
+	"job_wiz",
+	"pay_gld",
+	"payg_cas01",
+	"payg_cas02",
+	"payg_cas03",
+	"payg_cas04",
+	"payg_cas05",
+	"prt_gld",
+	"prtg_cas01",
+	"prtg_cas02",
+	"prtg_cas03",
+	"prtg_cas04",
+	"prtg_cas05",
+
+	//--- Ep5.0 Juno ---
+	"alde_alche",
+	"in_rogue",
+	"job_cru",
+	"job_duncer",
+	"job_monk",
+	"job_sage",
+	"mag_dun01",
+	"mag_dun02",
+	"monk_test",
+	"quiz_test",
+	"yuno",
+	"yuno_fild01",
+	"yuno_fild02",
+	"yuno_fild03",
+	"yuno_fild04",
+	"yuno_in01",
+	"yuno_in02",
+	"yuno_in03",
+	"yuno_in04",
+	"yuno_in05",
+
+	//--- Ep6.0 - Amatsu  ---
+	// Requires: kRO 08-10-03 or newer
+	// or kRO Sakray 09-09-03 or newer
+	"ama_dun01",
+	"ama_dun02",
+	"ama_dun03",
+	"ama_fild01",
+	"ama_in01",
+	"ama_in02",
+	"ama_test",
+	"amatsu",
+
+	//--- Ep6.1 - Kunlun ---
+	"gon_dun01",
+	"gon_dun02",
+	"gon_dun03",
+	"gon_fild01",
+	"gon_in",
+	"gon_test",
+	"gonryun",
+	"sec_in01",
+	"sec_in02",
+	"sec_pri",
+
+	//--- Ep6.2 - Umbala ---
+	// Requires: kRO 01-27-04 or newer
+	// or kRO Sakray 12-02-03 or newer
+	// or Akaru's SuperGRF 1.22 or newer
+	"umbala",
+	"um_dun01",
+	"um_dun02",
+	"um_fild01",
+	"um_fild02",
+	"um_fild03",
+	"um_fild04",
+	"um_in",
+
+	//--- Ep6.3 - Niflheim ---
+	// Requires: kRO 02-23-04 or newer
+	// or kRO Sakray 01-09-04 or newer
+	// or Akaru's SuperGRF 1.32 or newer
+	"niflheim",
+	"nif_fild01",
+	"nif_fild02",
+	"nif_in",
+	"yggdrasil01",
+
+	//--- Ep6.4 - Valkyrie ---
+	// Requires: kRO ??-??-04 or newer
+	// or kRO Sakray 02-03-04 or newer
+	// or Akaru's SuperGRF 1.34 or newer
+	"valkyrie",
+	"himinn",
+
+	//--- Ep6.5 - Louyang ---
+	// Requires kRO Sakray 03-30 or newer
+	//(Akaru's SuperGRF required version: 1.52)
+	"lou_in01",
+	"lou_in02",
+	"lou_dun03",
+	"lou_dun02",
+	"lou_dun01",
+	"lou_fild01",
+	"louyang",
+
+	//--- Ep6.6 - Novice Guild Siege ---
+	//Requires kRO Sakray 04-07 or newer
+	//(Akaru's SuperGRF required version: 1.53)
+	//"siege_test",
+	"n_castle",
+	"nguild_gef",
+	"nguild_prt",
+	"nguild_pay",
+	"nguild_alde",
+
+	//--- Ep6.7 - Jawaii ---
+	//Requires kRO Sakray 06-22 or newer
+	//(Akaru's SuperGRF required version: 1.63)
+	"jawaii",
+	"jawaii_in",
+
+	// --- Ep6.8 - Geffenia ---
+	// Requires kRO Sakray 07-13 or newer
+	// (Akaru's SuperGRF required version: 1.64)
+	"gefenia01",
+	"gefenia02",
+	"gefenia03",
+	"gefenia04",
+
+	// --- Ep6.9 - New Payon ---
+	// Requires kRO Sakray 09-03
+	"payon",
+	"payon_in01",
+	"payon_in02",
+	"payon_in03",
+	//same names as old maps except that payon_in03 got added
+
+	// --- Ep? - Ayothaya ---
+	// Requires kRO Sakray 09-21
+	// -- 2004-10-19sdata_k.gpf --
+	"ayothaya",
+	"ayo_in01",
+	"ayo_in02",
+	"ayo_fild01",
+	"ayo_fild02",
+	"ayo_dun01",
+	"ayo_dun02",
+
+	// --- God item quests maps ---
+	// -- 2004-10-12sdata_k3.gpf --
+	"que_god01",
+	"que_god02",
+
+	// --- Ep? - Schwarzwald Republic ---
+	// -- 2004-12-28sdata_k.gpf --
+	"yuno_fild05",
+	"yuno_fild07",
+	"yuno_fild08",
+	"yuno_fild09",
+	"yuno_fild11",
+	"yuno_fild12",
+
+	// --- Turbo Track Arena ---
+	// -- 2005-03-08sdata_k.gpf --
+	"alde_tt02",
+	"turbo_n_1",
+	"turbo_n_4",
+	"turbo_n_8",
+	"turbo_n_16",
+	"turbo_e_4",
+	"turbo_e_8",
+	"turbo_e_16",
+	"turbo_room",
+
+	// --- Einbroch/Einbech ---
+	// -- 2005-03-15sdata_k.gpf --
+	"airplane",
+	"airport",
+	"einbech",
+	"einbroch",
+	"ein_dun01",
+	"ein_dun02",
+	"ein_fild06",
+	"ein_fild07",
+	"ein_fild08",
+	"ein_fild09",
+	"ein_fild10",
+	"ein_in01",
+	"que_sign01",
+	"que_sign02",
+
+	// --- Einbroch and Lightalzen ---
+	// -- 2005-05-10sdata_k.gpf --
+	"ein_fild03",
+	"ein_fild04",
+	"lhz_fild02",
+	"lhz_fild03",
+
+	// --- Lighthalzen and Juperos Dungeon ---
+	// -- 2005-06-14sdata_k.gpf --
+	"yuno_pre",
+	"lhz_fild01",
+	"lighthalzen",
+	"lhz_in01",
+	"lhz_in02",
+	"lhz_in03",
+	"lhz_que01",
+	"lhz_dun01",
+	"lhz_dun02",
+	"lhz_dun03",
+	"lhz_cube",
+	"juperos_01",
+	"juperos_02",
+	"jupe_area1",
+	"jupe_area2",
+	"jupe_core",
+	"jupe_ele",
+	"jupe_ele_r",
+	"jupe_gate",
+
+	// --- Lighthalzen & Juno Airport ---
+	// -- resnametable clones of airport and airplane --
+	"y_airport",
+	"lhz_airport",
+	"airplane_01",
+
+	// --- Juperos Dungeon ---
+	// -- 2005-06-28sdata_k.gpf --
+	"jupe_cave",
+
+	// --- Quiz Revolution ---
+	// -- 2005-08-02sdata_k.gpf --
+	"quiz_02",
+
+	// --- Hugel Field ---
+	// -- 2005-08-23sdata_k.gpf --
+	"hu_fild07",
+	"hu_fild05",
+	"hu_fild04",
+	"hu_fild01",
+	"yuno_fild06",
+
+	// --- Star Knight And Soul Linker Job Change Maps ---
+	// -- 2005-08-23sdata_k.gpf --
+	"job_soul",
+	"job_star",
+
+	// --- Abyss Lake, Thanatos Tower --
+	// -- 2005-09-13sdata_k.gpf - 2005-09-13sdata_k6.gpf --
+	"que_job01",
+	"que_job02",
+	"que_job03",
+	"abyss_01",
+	"abyss_02",
+	"abyss_03",
+	"thana_step",
+	"thana_boss",
+	"tha_scene01",
+	"tha_t01",
+	"tha_t02",
+	"tha_t03",
+	"tha_t04",
+	"tha_t07",
+	"tha_t05",
+	"tha_t06",
+	"tha_t08",
+
+	// --- Thanatos Tower ---
+	// -- 2005-09-21sdata_k.gpf -- ",
+	"tha_t09",
+	"tha_t10",
+	"tha_t11",
+	"tha_t12",
+
+	// --- Auction Market ---
+	// -- 2005-11-29sdata_k.gpf --
+	"auction_01",
+	"auction_02",
+
+	// ???
+	// -- 2005-12-06gdata_k.gpf --
+	"alde_tt03",
+
+	// --- Garden City Hugel / Kiehl ---
+	// -- 2005-12-20sdata_k.gpf --
+	"hugel",
+	"hu_in01",
+	"que_bingo",
+	"que_hugel",
+	"p_track01",
+	"p_track02",
+	"odin_tem01",
+	"odin_tem02",
+	"odin_tem03",
+	"hu_fild02",
+	"hu_fild03",
+	"hu_fild06",
+	"ein_fild01",
+	"ein_fild02",
+	"ein_fild05",
+	"yuno_fild10",
+	"kh_kiehl02",
+	"kh_kiehl01",
+	"kh_dun02",
+	"kh_dun01",
+	"kh_mansion",
+	"kh_rossi",
+	"kh_school",
+	"kh_vila",
+
+	// --- Poring Arena (?) & Gunslinger/Ninja Job Map ---
+	// -- 2006-03-28sdata_k.gpf --
+	//"poring_c01",
+	//"poring_c02",
+	"que_ng",
+
+	// --- Arunafeltz & Ice Dungeon ---
+	// -- 2006-05-30sdata_k.gpf --
+	"rachel",
+	"ra_in01",
+	"ra_fild01",
+	"ra_fild02",
+	"ra_fild03",
+	"ra_fild04",
+	"ra_fild05",
+	"ra_fild06",
+	"ra_fild07",
+	"ra_fild08",
+	"ra_fild09",
+	"ra_fild10",
+	"ra_fild11",
+	"ra_fild12",
+	"ra_fild13",
+	"ra_san01",
+	"ra_san02",
+	"ra_san03",
+	"ra_san04",
+	"ra_san05",
+	"ra_temin",
+	"ra_temple",
+	"ra_temsky",
+	"que_rachel",
+	"que_san04",
+	"ice_dun01",
+	"ice_dun02",
+	"ice_dun03",
+	"ice_dun04",
+
+	// --- Veins & Thor Dungeon ---
+	// -- 2006-12-19sdata_k.gpf --
+	"que_thor",
+	"thor_camp",
+	"thor_v01",
+	"thor_v02",
+	"thor_v03",
+	"veins",
+	"ve_in",
+	"ve_in02",
+	"ve_fild01",
+	"ve_fild02",
+	"ve_fild03",
+	"ve_fild04",
+	"ve_fild05",
+	"ve_fild06",
+	"ve_fild07",
+
+	// --- Nameless Island & Abbey Dungeon ---
+	// -- 2007-04-03sdata_k.gpf --
+	"nameless_i",
+	"nameless_n",
+	"nameless_in",
+	"abbey01",
+	"abbey02",
+	"abbey03",
+	"poring_w01",
+	"poring_w02",
+
+	// --- ??? ---
+	// -- 2007-??-?? --
+	"06guild_r",
+	"06guild_01",
+	"06guild_02",
+	"06guild_03",
+	"06guild_04",
+	"06guild_05",
+	"06guild_06",
+	"06guild_07",
+	"06guild_08",
+	"z_agit",
+	"que_temsky",
+	"itemmall",
+	"bossnia_01",
+	"bossnia_02",
+	"bossnia_03",
+	"bossnia_04",
+
+	// --- Moscovia ---
+	// -- 2007-06-??? --
+	"moscovia",
+	"mosk_in",
+	"mosk_ship",
+	"mosk_fild01",
+	"mosk_fild02",
+	"mosk_dun01",
+	"mosk_dun02",
+	"mosk_dun03",
+	"mosk_que",
+
+	// --- Episode 12: Satan Morroc & Schwarzwald Siege ---
+	// -- 2007-09-19sdata_k.gpf --
+	"schg_cas01",
+	"schg_cas02",
+	"schg_cas03",
+	"schg_cas04",
+	"schg_cas05",
+	"sch_gld",
+	"cave",
+	"moc_fild20",
+	"moc_fild21",
+	"moc_fild22",
+	"que_ba",
+	"que_moc_16",
+	"que_moon",
+
+	// Arunafeltz Seige
+	// -- 2007-10-24sdata_k.gpf --
+	"arug_cas01",
+	"arug_cas02",
+	"arug_cas03",
+	"arug_cas04",
+	"arug_cas05",
+	"aru_gld",
+
+	// PVP Battle Fields: Tierra Valley, and Flavius
+	// -- 2007-11-14sdata_k.gpf --
+	"bat_room",
+	"bat_a01",
+	"bat_a02",
+	"bat_b01",
+	"bat_b02",
+	"que_qsch01",
+	"que_qsch02",
+	"que_qsch03",
+	"que_qsch04",
+	"que_qsch05",
+	"que_qaru01",
+	"que_qaru02",
+	"que_qaru03",
+	"que_qaru04",
+	"que_qaru05",
+
+	// Endless Tower Memorial Dungeon
+	// -- 2007-11-28sdata_k.gpf --
+	"1@cata",
+	"2@cata",
+	"e_tower",
+	"1@tower",
+	"2@tower",
+	"3@tower",
+	"4@tower",
+	"5@tower",
+	"6@tower",
+
+	// 13.1 Another World
+	// -- 2008-05-28sdata_k.gpf --
+	"mid_camp",
+	"mid_campin",
+	"man_fild01",
+	"man_fild03",
+	"spl_fild02",
+	"spl_fild03",
+	"moc_fild22b",
+	"que_dan01",
+	"que_dan02",
+	"schg_que01",
+	"schg_dun01",
+	"arug_que01",
+	"arug_dun01",
+	"1@orcs",
+	"2@orcs",
+
+	// KvM Battleground
+	// -- 2008-??-??? --
+	"bat_c01",
+	"bat_c02",
+	"bat_c03",
+
+	// 13.2 Another World
+	// -- 2008-11-26 --
+	"1@nyd",
+	"2@nyd",
+	"nyd_dun01",
+	"nyd_dun02",
+	"manuk",
+	"man_fild02",
+	"man_in01",
+	"splendide",
+	"spl_fild01",
+	"spl_in01",
+	"spl_in02",
+
+	// 3rd Job Maps
+	// -- 2009-01-29rdata_k2.gpf --
+	"job3_arch01",
+	"job3_arch02",
+	"job3_arch03",
+	"job3_guil01",
+	"job3_guil02",
+	"job3_guil03",
+	"job3_rang01",
+	"job3_rang02",
+	"job3_rune01",
+	"job3_rune02",
+	"job3_rune03",
+	"job3_war01",
+	"job3_war02",
+	"jupe_core2",
+
+	// ???
+	// -- 2009-05-27rdata_k.gpf --
+	"moc_para01",
+
+	// Brasilis Maps
+	// -- 2009-08-05rdata_k.gpf --
+	"brasilis",
+	"bra_in01",
+	"bra_fild01",
+	"bra_dun01",
+	"bra_dun02",
+
+	// ???
+	// -- 2009-09-30rdata_k.gpf --
+	"s_atelier",
+
+	// 13.3 El Discastes
+	// -- 2009-12-09rdata_k.gpf --
+	"dicastes01",
+	"dicastes02",
+	"dic_in01",
+	"dic_fild01",
+	"dic_fild02",
+	"dic_dun01",
+	"dic_dun02",
+	"job3_gen01",
+	"job3_sha01",
+
+	// Localized Event Maps
+	//"evt_zombie",
+	//"evt_coke",
+
+	// Unknown Maps
+	//"ac_sl_area",
+	//"ac_cl_hall",
+	//"ac_cl_room",
+	//"jp_s_dun11",
+
+	// 14.1 Bifrost
+	// -- 2010-06-09rdata_x.gpf --
+	"mora",
+	"bif_fild01",
+	"bif_fild02",
+	"1@mist",
+
+	// Dewata
+	// -- 2010-09-15rdata_x.gpf --
+	"dewata",
+	"dew_in01",
+	"dew_fild01",
+	"dew_dun01",
+	"dew_dun02",
+
+	// ???
+	// -- 2010-10-06rdata_x.gpf --
+	"que_house_s",
+
+	// Malangdo
+	// -- 2010-11-03rdata_x.gpf --
+	"malangdo",
+	"mal_in01",
+	"mal_in02",
+	"mal_dun01",
+	"1@pump",
+	"2@pump",
+	"1@cash",
+
+	// Undersea Tunnel Expansion
+	// -- 2010-11-10rdata_x.gpf --
+	"iz_dun05",
+
+	// ???
+	// -- 2010-12-01data_x.gpf --
+	"evt_mobroom",
+
+	// ???
+	"dic_dun03",
+	//"mjolnir_04_1",
+	//"evt_swar_b",
+	//"evt_swar_r",
+	//"evt_swar_s",
+	//"evt_swar_t",
+
+	// Lighthalzen Dungeon F4, Wolfchev's Laboratory
+	// -- 2011-03-16rdata_x.gpf --
+	"1@lhz",
+	"lhz_dun04",
+	"que_lhz",
+
+	// Hall Of Abyss
+	// -- 2011-06-15data_x.gpf --
+	"gld_dun01_2",
+	"gld_dun02_2",
+	"gld_dun03_2",
+	"gld_dun04_2",
+	"gld2_ald",
+	"gld2_gef",
+	"gld2_pay",
+	"gld2_prt",
+
+	// Malaya Port
+	// -- 2011-08-30data_x.gpf --
+	"malaya",
+	"ma_fild01",
+	"ma_fild02",
+	"ma_scene01",
+	"ma_in01",
+	"ma_dun01",
+	"1@ma_h",
+	"1@ma_c",
+	"1@ma_b",
+	"ma_zif01",
+	"ma_zif02",
+	"ma_zif03",
+	"ma_zif04",
+	"ma_zif05",
+	"ma_zif06",
+	"ma_zif07",
+	"ma_zif08",
+	"ma_zif09",
+	"job_ko",
+
+	// 14.2 Eclage
+	// -- 2011-11-30data_x.gpf --
+	"eclage",
+	"ecl_fild01",
+	"ecl_in01",
+	"ecl_in02",
+	"ecl_in03",
+	"ecl_in04",
+	"1@ecl",
+	"ecl_tdun01",
+	"ecl_tdun02",
+	"ecl_tdun03",
+	"ecl_tdun04",
+	"ecl_hub01",
+	"que_avan01",
+
+	// Pyramids Basement Nightmare Mode
+	"moc_prydn1",
+	"moc_prydn2",
+
+	// Izlude Novice Academy & Tutorial
+	// New Maps added 2013-02-10
+	"iz_int",
+	"iz_int01",
+	"iz_int02",
+	"iz_int03",
+	"iz_int04",
+	"iz_ac01",
+	"iz_ac02",
+	"iz_ng01",
+	"treasure_n1",
+	"treasure_n2",
+	"iz_ac01_d",
+	"iz_ac02_d",
+	"iz_ac01_c",
+	"iz_ac02_c",
+	"iz_ac01_b",
+	"iz_ac02_b",
+	"iz_ac01_a",
+	"iz_ac02_a",
+	"izlude_d",
+	"izlude_c",
+	"izlude_b",
+	"izlude_a",
+
+	"prt_fild08d",
+	"prt_fild08c",
+	"prt_fild08b",
+	"prt_fild08a",
+
+	// War of Emperium - Third Edition (TE)
+	"te_prt_gld",
+	"te_prtcas01",
+	"te_prtcas02",
+	"te_prtcas03",
+	"te_prtcas04",
+	"te_prtcas05",
+	"teg_dun01",
+	"teg_dun02",
+	"te_alde_gld",
+	"te_aldecas1",
+	"te_aldecas2",
+	"te_aldecas3",
+	"te_aldecas4",
+	"te_aldecas5",
+
+	// Glast Heim Memorial & Nightmare
+	"gl_cas02_",
+	"gl_chyard_",
+	"1@gl_k",
+	"2@gl_k",
+
+	"silk_lair",
+	"evt_bomb",
+
+	// Wave Mode Memorial Dungeon
+	"1@def01",
+	"1@def02",
+	"1@def03",
+
+	// Heroes' Trails - Part 1
+	"1@face",
+	"1@sara",
+	"1@tnm1",
+	"1@tnm2",
+	"1@tnm3",
+	"1@ge_st",
+	"1@gef",
+	"1@gef_in",
+	"1@spa",
+	"dali",
+	"dali02",
+
+	// Episode 14.3
+	"moro_vol",
+	"moro_cav",
+	"1@dth1",
+	"1@dth2",
+	"1@dth3",
+	"1@rev",
+	"1@xm_d",
+	"1@eom",
+	"1@jtb",
+
+	// Clock Tower Nightmare Mode
+	"c_tower2_",
+	"c_tower3_",
+
+	//------------------------- Clone Maps ---------------------------
+	//------------------------- Extra Maps ---------------------------
+
+	// Ragnarok World Championship 2004
+	// Requires: RWC 2004 Client
+	// or Akaru's SuperGRF 1.64 or newer
+	//"rwc01",
+	//"rwc02",
+	//"rwc03",
+
+	// Ragnarok World Championship 2009
+	// Requires: RWC 2009 Map files
+	//"2009rwc_f01",
+	//"2009rwc_01",
+	//"2009rwc_02",
+	//"2009rwc_03",
+	//"2009rwc_04",
+
+	// Ragnarok World Championship 2008?
+	// Requires: RWC 2008 Map files?
+	//"2008rwc_04",
+
+	//Christmas & Sakura Special
+	//Requires Akaru's SuperGRF 1.1 or newer
+	//"prontera_x",
+	//"alberta_x",
+	//"aldebaran_x",
+	//"geffen_x",
+	//"izlude_x",
+	//"prt_church_x",
+	//"prontera_s",
+	//"pay_arche_s",
+
+	//Fenced Lutie",
+	//Requires Akaru's SuperGRF 1.23 or newer",
+	//"xmas_old",
+
+	//Alpha Maps
+	//Requires adata.grf containing alpha maps and data
+	//"fay_vilg00",
+	//"fay_vilg01",
+	//"gef_vilg00",
+	//"gef_vilg01",
+	//"moc_dugn01",
+	//"moc_dugn02",
+	//"moc_fild01",
+	//"moc_fild02",
+	//"moc_fild03",
+	//"moc_fild04",
+	//"moc_intr00",
+	//"moc_intr01",
+	//"moc_intr02",
+	//"moc_intr04",
+	//"moc_vilg00",
+	//"moc_vilg01",
+	//"moc_vilg02",
+	//"probemap",
+	//"probemap02",
+	//"prt_cstl01",
+	//"prt_dugn00",
+	//"prt_dugn01",
+	//"prt_fild00",
+	//"prt_fild01",
+	//"prt_fild03",
+	//"prt_fild04",
+	//"prt_fild05",
+	//"prt_intr01",
+	//"prt_intr01_a",
+	//"prt_intr02",
+	//"prt_vilg00",
+	//"prt_vilg01",
+	//"prt_vilg02",
+	//"tank_test",
+	//"tank_test2",
+	//"test",
+) //map_list
diff --git a/conf/maps.conf b/conf/maps.conf
deleted file mode 100644
index 529afa9ce..000000000
--- a/conf/maps.conf
+++ /dev/null
@@ -1,1225 +0,0 @@
-//------------------------- Normal Maps ---------------------------
-map: alb_ship
-map: alb2trea
-map: alberta
-map: alberta_in
-map: alde_dun01
-map: alde_dun02
-map: alde_dun03
-map: alde_dun04
-map: aldeba_in
-map: aldebaran
-map: anthell01
-map: anthell02
-map: arena_room
-map: c_tower1
-map: c_tower2
-map: c_tower3
-map: c_tower4
-//map: force_map1
-//map: force_map2
-//map: force_map3
-map: force_1-1
-map: force_2-1
-map: force_3-1
-map: force_4-1
-map: force_5-1
-map: force_1-2
-map: force_2-2
-map: force_3-2
-map: force_1-3
-map: force_2-3
-map: force_3-3
-map: gef_dun00
-map: gef_dun01
-map: gef_dun02
-map: gef_dun03
-map: gef_fild00
-map: gef_fild01
-map: gef_fild02
-map: gef_fild03
-map: gef_fild04
-map: gef_fild05
-map: gef_fild06
-map: gef_fild07
-map: gef_fild08
-map: gef_fild09
-map: gef_fild10
-map: gef_fild11
-map: gef_fild12
-map: gef_fild13
-map: gef_fild14
-map: gef_tower
-map: geffen
-map: geffen_in
-map: gl_cas01
-map: gl_cas02
-map: gl_church
-map: gl_chyard
-map: gl_dun01
-map: gl_dun02
-map: gl_in01
-map: gl_knt01
-map: gl_knt02
-map: gl_prison
-map: gl_prison1
-map: gl_sew01
-map: gl_sew02
-map: gl_sew03
-map: gl_sew04
-map: gl_step
-map: glast_01
-//map: hunter_1-1
-//map: hunter_2-1
-//map: hunter_3-1
-map: in_hunter
-map: in_moc_16
-map: in_orcs01
-map: in_sphinx1
-map: in_sphinx2
-map: in_sphinx3
-map: in_sphinx4
-map: in_sphinx5
-map: iz_dun00
-map: iz_dun01
-map: iz_dun02
-map: iz_dun03
-map: iz_dun04
-map: izlu2dun
-map: izlude
-map: izlude_in
-map: job_thief1
-//map: knight_1-1
-//map: knight_2-1
-//map: knight_3-1
-map: mjo_dun01
-map: mjo_dun02
-map: mjo_dun03
-map: mjolnir_01
-map: mjolnir_02
-map: mjolnir_03
-map: mjolnir_04
-map: mjolnir_05
-map: mjolnir_06
-map: mjolnir_07
-map: mjolnir_08
-map: mjolnir_09
-map: mjolnir_10
-map: mjolnir_11
-map: mjolnir_12
-map: moc_castle
-map: moc_fild01
-map: moc_fild02
-map: moc_fild03
-//map: moc_fild04
-//map: moc_fild05
-//map: moc_fild06
-map: moc_fild07
-//map: moc_fild08
-//map: moc_fild09
-//map: moc_fild10
-map: moc_fild11
-map: moc_fild12
-map: moc_fild13
-//map: moc_fild14
-//map: moc_fild15
-map: moc_fild16
-map: moc_fild17
-map: moc_fild18
-map: moc_fild19
-map: moc_pryd01
-map: moc_pryd02
-map: moc_pryd03
-map: moc_pryd04
-map: moc_pryd05
-map: moc_pryd06
-map: moc_prydb1
-map: moc_ruins
-map: monk_in
-map: morocc
-map: morocc_in
-map: new_zone01
-map: new_zone02
-map: new_zone03
-map: new_zone04
-map: new_1-1
-map: new_1-2
-map: new_1-3
-map: new_1-4
-map: new_2-1
-map: new_2-2
-map: new_2-3
-map: new_2-4
-map: new_3-1
-map: new_3-2
-map: new_3-3
-map: new_3-4
-map: new_4-1
-map: new_4-2
-map: new_4-3
-map: new_4-4
-map: new_5-1
-map: new_5-2
-map: new_5-3
-map: new_5-4
-map: orcsdun01
-map: orcsdun02
-//map: ordeal_a00
-//map: ordeal_a02
-map: ordeal_1-1
-map: ordeal_1-2
-//map: ordeal_1-3
-//map: ordeal_1-4
-map: ordeal_2-1
-map: ordeal_2-2
-//map: ordeal_2-3
-//map: ordeal_2-4
-map: ordeal_3-1
-map: ordeal_3-2
-//map: ordeal_3-3
-//map: ordeal_3-4
-map: pay_arche
-map: pay_dun00
-map: pay_dun01
-map: pay_dun02
-map: pay_dun03
-map: pay_dun04
-map: pay_fild01
-map: pay_fild02
-map: pay_fild03
-map: pay_fild04
-map: pay_fild05
-map: pay_fild06
-map: pay_fild07
-map: pay_fild08
-map: pay_fild09
-map: pay_fild10
-map: pay_fild11
-//map: priest_1-1
-//map: priest_2-1
-//map: priest_3-1
-map: prontera
-map: prt_are_in
-map: prt_are01
-map: prt_castle
-map: prt_church
-map: prt_fild00
-map: prt_fild01
-map: prt_fild02
-map: prt_fild03
-map: prt_fild04
-map: prt_fild05
-map: prt_fild06
-map: prt_fild07
-map: prt_fild08
-map: prt_fild09
-map: prt_fild10
-map: prt_fild11
-map: prt_in
-map: prt_maze01
-map: prt_maze02
-map: prt_maze03
-map: prt_monk
-map: prt_sewb1
-map: prt_sewb2
-map: prt_sewb3
-map: prt_sewb4
-map: pvp_room
-map: pvp_2vs2
-map: pvp_c_room
-map: pvp_n_1-1
-map: pvp_n_1-2
-map: pvp_n_1-3
-map: pvp_n_1-4
-map: pvp_n_1-5
-map: pvp_n_2-1
-map: pvp_n_2-2
-map: pvp_n_2-3
-map: pvp_n_2-4
-map: pvp_n_2-5
-map: pvp_n_3-1
-map: pvp_n_3-2
-map: pvp_n_3-3
-map: pvp_n_3-4
-map: pvp_n_3-5
-map: pvp_n_4-1
-map: pvp_n_4-2
-map: pvp_n_4-3
-map: pvp_n_4-4
-map: pvp_n_4-5
-map: pvp_n_5-1
-map: pvp_n_5-2
-map: pvp_n_5-3
-map: pvp_n_5-4
-map: pvp_n_5-5
-map: pvp_n_6-1
-map: pvp_n_6-2
-map: pvp_n_6-3
-map: pvp_n_6-4
-map: pvp_n_6-5
-map: pvp_n_7-1
-map: pvp_n_7-2
-map: pvp_n_7-3
-map: pvp_n_7-4
-map: pvp_n_7-5
-map: pvp_n_8-1
-map: pvp_n_8-2
-map: pvp_n_8-3
-map: pvp_n_8-4
-map: pvp_n_8-5
-map: pvp_n_room
-map: pvp_y_1-1
-map: pvp_y_1-2
-map: pvp_y_1-3
-map: pvp_y_1-4
-map: pvp_y_1-5
-map: pvp_y_2-1
-map: pvp_y_2-2
-map: pvp_y_2-3
-map: pvp_y_2-4
-map: pvp_y_2-5
-map: pvp_y_3-1
-map: pvp_y_3-2
-map: pvp_y_3-3
-map: pvp_y_3-4
-map: pvp_y_3-5
-map: pvp_y_4-1
-map: pvp_y_4-2
-map: pvp_y_4-3
-map: pvp_y_4-4
-map: pvp_y_4-5
-map: pvp_y_5-1
-map: pvp_y_5-2
-map: pvp_y_5-3
-map: pvp_y_5-4
-map: pvp_y_5-5
-map: pvp_y_6-1
-map: pvp_y_6-2
-map: pvp_y_6-3
-map: pvp_y_6-4
-map: pvp_y_6-5
-map: pvp_y_7-1
-map: pvp_y_7-2
-map: pvp_y_7-3
-map: pvp_y_7-4
-map: pvp_y_7-5
-map: pvp_y_8-1
-map: pvp_y_8-2
-map: pvp_y_8-3
-map: pvp_y_8-4
-map: pvp_y_8-5
-map: pvp_y_room
-map: sword_1-1
-map: sword_2-1
-map: sword_3-1
-map: treasure01
-map: treasure02
-//map: wizard_1-1
-//map: wizard_2-1
-//map: wizard_3-1
-map: xmas
-map: xmas_dun01
-map: xmas_dun02
-map: xmas_fild01
-map: xmas_in
-
-//---Ep3.0 Comodo ---
-
-map: beach_dun
-map: beach_dun2
-map: beach_dun3
-map: cmd_fild01
-map: cmd_fild02
-map: cmd_fild03
-map: cmd_fild04
-map: cmd_fild05
-map: cmd_fild06
-map: cmd_fild07
-map: cmd_fild08
-map: cmd_fild09
-map: cmd_in01
-map: cmd_in02
-map: comodo
-
-//---EP3.1 Quiz Revolution ---
-
-map: quiz_00
-map: quiz_01
-map: g_room1-1
-map: g_room1-2
-map: g_room1-3
-map: g_room2
-
-//--- Ep4.0 Turtle Island ---
-
-map: tur_dun01
-map: tur_dun02
-map: tur_dun03
-map: tur_dun04
-map: tur_dun05
-map: tur_dun06
-
-//--- Ep4.1 The War of Emperium ---
-
-map: alde_gld
-map: aldeg_cas01
-map: aldeg_cas02
-map: aldeg_cas03
-map: aldeg_cas04
-map: aldeg_cas05
-map: gefg_cas01
-map: gefg_cas02
-map: gefg_cas03
-map: gefg_cas04
-map: gefg_cas05
-map: gld_dun01
-map: gld_dun02
-map: gld_dun03
-map: gld_dun04
-map: guild_room
-map: guild_vs1
-map: guild_vs2
-map: guild_vs3
-map: guild_vs4
-map: guild_vs5
-map: guild_vs1-1
-map: guild_vs1-2
-map: guild_vs1-3
-map: guild_vs1-4
-map: guild_vs2-1
-map: guild_vs2-2
-//map: job_hunter
-map: job_hunte
-//map: job_knight
-map: job_knt
-//map: job_priest
-map: job_prist
-map: job_sword1
-//map: job_wizard
-map: job_wiz
-map: pay_gld
-map: payg_cas01
-map: payg_cas02
-map: payg_cas03
-map: payg_cas04
-map: payg_cas05
-map: prt_gld
-map: prtg_cas01
-map: prtg_cas02
-map: prtg_cas03
-map: prtg_cas04
-map: prtg_cas05
-
-
-//--- Ep5.0 Yuno ---
-
-map: alde_alche
-map: in_rogue
-map: job_cru
-map: job_duncer
-map: job_monk
-map: job_sage
-map: mag_dun01
-map: mag_dun02
-map: monk_test
-map: quiz_test
-map: yuno
-map: yuno_fild01
-map: yuno_fild02
-map: yuno_fild03
-map: yuno_fild04
-map: yuno_in01
-map: yuno_in02
-map: yuno_in03
-map: yuno_in04
-map: yuno_in05
-
-//--- Ep6.0 - Amatsu  ---
-// Requires: kRO 08-10-03 or newer
-// or kRO Sakray 09-09-03 or newer
-
-map: ama_dun01
-map: ama_dun02
-map: ama_dun03
-map: ama_fild01
-map: ama_in01
-map: ama_in02
-map: ama_test
-map: amatsu
-
-//--- Ep6.1 - Gon Ryun ---
-
-map: gon_dun01
-map: gon_dun02
-map: gon_dun03
-map: gon_fild01
-map: gon_in
-map: gon_test
-map: gonryun
-map: sec_in01
-map: sec_in02
-map: sec_pri
-
-//--- Ep6.2 - Umbala ---
-// Requires: kRO 01-27-04 or newer
-// or kRO Sakray 12-02-03 or newer
-// or Akaru's SuperGRF 1.22 or newer
-map: umbala
-map: um_dun01
-map: um_dun02
-map: um_fild01
-map: um_fild02
-map: um_fild03
-map: um_fild04
-map: um_in
-
-//--- Ep6.3 - Niflheim ---
-// Requires: kRO 02-23-04 or newer
-// or kRO Sakray 01-09-04 or newer
-// or Akaru's SuperGRF 1.32 or newer
-map: niflheim
-map: nif_fild01
-map: nif_fild02
-map: nif_in
-map: yggdrasil01
-
-//--- Ep6.4 - Valkyrie ---
-// Requires: kRO ??-??-04 or newer
-// or kRO Sakray 02-03-04 or newer
-// or Akaru's SuperGRF 1.34 or newer
-map: valkyrie
-map: himinn
-
-//--- Ep6.5 - Castle of Dragon (LouYang) ---
-// Requires kRO Sakray 03-30 or newer
-//(Akaru's SuperGRF required version: 1.52)
-map: lou_in01
-map: lou_in02
-map: lou_dun03
-map: lou_dun02
-map: lou_dun01
-map: lou_fild01
-map: louyang
-
-//--- Ep6.6 - Novice Guild Siege ---
-//Requires kRO Sakray 04-07 or newer
-//(Akaru's SuperGRF required version: 1.53)
-//map: siege_test
-map: n_castle
-map: nguild_gef
-map: nguild_prt
-map: nguild_pay
-map: nguild_alde
-
-//--- Ep6.7 - Jawaii ---
-//Requires kRO Sakray 06-22 or newer
-//(Akaru's SuperGRF required version: 1.63)
-map: jawaii
-map: jawaii_in
-
-// --- Ep6.8 - Geffenia ---
-// Requires kRO Sakray 07-13 or newer
-// (Akaru's SuperGRF required version: 1.64)
-map: gefenia01
-map: gefenia02
-map: gefenia03
-map: gefenia04
-
-// --- Ep6.9 - New Payon ---
-// Requires kRO Sakray 09-03
-// -- dunno --
-map: payon
-map: payon_in01
-map: payon_in02
-map: payon_in03
-//same names as old maps except that payon_in03 got added
-
-// --- Ep? - Ayothaya ---
-// Requires kRO Sakray 09-21
-// -- 2004-10-19sdata_k.gpf --
-map: ayothaya
-map: ayo_in01
-map: ayo_in02
-map: ayo_fild01
-map: ayo_fild02
-map: ayo_dun01
-map: ayo_dun02
-
-// --- God item quests maps ---
-// -- 2004-10-12sdata_k3.gpf --
-map: que_god01
-map: que_god02
-
-// --- Ep? - Schwarzwald Republic ---
-// -- 2004-12-28sdata_k.gpf --
-map: yuno_fild05
-map: yuno_fild07
-map: yuno_fild08
-map: yuno_fild09
-map: yuno_fild11
-map: yuno_fild12
-
-// --- Turbo Track Arena ---
-// -- 2005-03-08sdata_k.gpf --
-map: alde_tt02
-map: turbo_n_1
-map: turbo_n_4
-map: turbo_n_8
-map: turbo_n_16
-map: turbo_e_4
-map: turbo_e_8
-map: turbo_e_16
-map: turbo_room
-
-// --- Einbroch/Einbech ---
-// -- 2005-03-15sdata_k.gpf --
-map: airplane
-map: airport
-map: einbech
-map: einbroch
-map: ein_dun01
-map: ein_dun02
-map: ein_fild06
-map: ein_fild07
-map: ein_fild08
-map: ein_fild09
-map: ein_fild10
-map: ein_in01
-map: que_sign01
-map: que_sign02
-
-// --- Einbroch and Lightalzen ---
-// -- 2005-05-10sdata_k.gpf --
-map: ein_fild03
-map: ein_fild04
-map: lhz_fild02
-map: lhz_fild03
-
-// --- Lighthalzen and Juperos Dungeon ---
-// -- 2005-06-14sdata_k.gpf --
-map: yuno_pre
-map: lhz_fild01
-map: lighthalzen
-map: lhz_in01
-map: lhz_in02
-map: lhz_in03
-map: lhz_que01
-map: lhz_dun01
-map: lhz_dun02
-map: lhz_dun03
-map: lhz_cube
-map: juperos_01
-map: juperos_02
-map: jupe_area1
-map: jupe_area2
-map: jupe_core
-map: jupe_ele
-map: jupe_ele_r
-map: jupe_gate
-
-// --- Lighthalzen & Juno Airport ---
-// -- resnametable clones of airport and airplane --
-map: y_airport
-map: lhz_airport
-map: airplane_01
-
-// --- Juperos Dungeon ---
-// -- 2005-06-28sdata_k.gpf --
-map: jupe_cave
-
-// --- Quiz Revolution ---
-// -- 2005-08-02sdata_k.gpf --
-map: quiz_02
-
-// --- Hugel Field ---
-// -- 2005-08-23sdata_k.gpf --
-map: hu_fild07
-map: hu_fild05
-map: hu_fild04
-map: hu_fild01
-map: yuno_fild06
-
-// --- Star Knight And Soul Linker Job Change Maps ---
-// -- 2005-08-23sdata_k.gpf --
-map: job_soul
-map: job_star
-
-// --- Abyss Lake, Thanatos Tower --
-// -- 2005-09-13sdata_k.gpf - 2005-09-13sdata_k6.gpf --
-map: que_job01
-map: que_job02
-map: que_job03
-map: abyss_01
-map: abyss_02
-map: abyss_03
-map: thana_step
-map: thana_boss
-map: tha_scene01
-map: tha_t01
-map: tha_t02
-map: tha_t03
-map: tha_t04
-map: tha_t07
-map: tha_t05
-map: tha_t06
-map: tha_t08
-
-// --- Thanatos Tower ---
-// -- 2005-09-21sdata_k.gpf --
-map: tha_t09
-map: tha_t10
-map: tha_t11
-map: tha_t12
-
-// --- Auction Market ---
-// -- 2005-11-29sdata_k.gpf --
-map: auction_01
-map: auction_02
-
-// ???
-// -- 2005-12-06gdata_k.gpf
-map: alde_tt03
-
-// --- Garden City Hugel / Kiehl ---
-// -- 2005-12-20sdata_k.gpf --
-map: hugel
-map: hu_in01
-map: que_bingo
-map: que_hugel
-map: p_track01
-map: p_track02
-map: odin_tem01
-map: odin_tem02
-map: odin_tem03
-map: hu_fild02
-map: hu_fild03
-map: hu_fild06
-map: ein_fild01
-map: ein_fild02
-map: ein_fild05
-map: yuno_fild10
-map: kh_kiehl02
-map: kh_kiehl01
-map: kh_dun02
-map: kh_dun01
-map: kh_mansion
-map: kh_rossi
-map: kh_school
-map: kh_vila
-
-// --- Poring Arena (?) & Gunslinger/Ninja Job Map ---
-// -- 2006-03-28sdata_k.gpf --
-//map: poring_c01
-//map: poring_c02
-map: que_ng
-
-// --- Arunafeltz & Ice Dungeon ---
-// -- 2006-05-30sdata_k.gpf --
-map: rachel
-map: ra_in01
-map: ra_fild01
-map: ra_fild02
-map: ra_fild03
-map: ra_fild04
-map: ra_fild05
-map: ra_fild06
-map: ra_fild07
-map: ra_fild08
-map: ra_fild09
-map: ra_fild10
-map: ra_fild11
-map: ra_fild12
-map: ra_fild13
-map: ra_san01
-map: ra_san02
-map: ra_san03
-map: ra_san04
-map: ra_san05
-map: ra_temin
-map: ra_temple
-map: ra_temsky
-map: que_rachel
-map: que_san04
-map: ice_dun01
-map: ice_dun02
-map: ice_dun03
-map: ice_dun04
-
-// --- Veins & Thor Dungeon ---
-// -- 2006-12-19sdata_k.gpf --
-map: que_thor
-map: thor_camp
-map: thor_v01
-map: thor_v02
-map: thor_v03
-map: veins
-map: ve_in
-map: ve_in02
-map: ve_fild01
-map: ve_fild02
-map: ve_fild03
-map: ve_fild04
-map: ve_fild05
-map: ve_fild06
-map: ve_fild07
-
-// --- Nameless Island & Abbey Dungeon ---
-// -- 2007-04-03sdata_k.gpf
-map: nameless_i
-map: nameless_n
-map: nameless_in
-map: abbey01
-map: abbey02
-map: abbey03
-map: poring_w01
-map: poring_w02
-
-// --- ??? ---
-// -- 2007-??-??
-map: 06guild_r
-map: 06guild_01
-map: 06guild_02
-map: 06guild_03
-map: 06guild_04
-map: 06guild_05
-map: 06guild_06
-map: 06guild_07
-map: 06guild_08
-map: z_agit
-map: que_temsky
-map: itemmall
-map: bossnia_01
-map: bossnia_02
-map: bossnia_03
-map: bossnia_04
-
-// --- Moscovia ---
-// -- 2007-06-???
-map: moscovia
-map: mosk_in
-map: mosk_ship
-map: mosk_fild01
-map: mosk_fild02
-map: mosk_dun01
-map: mosk_dun02
-map: mosk_dun03
-map: mosk_que
-
-// --- Episode 12: Satan Morroc & Schwaltzvalt Seige ---
-// -- 2007-09-19sdata_k.gpf
-map: schg_cas01
-map: schg_cas02
-map: schg_cas03
-map: schg_cas04
-map: schg_cas05
-map: sch_gld
-map: cave
-map: moc_fild20
-map: moc_fild21
-map: moc_fild22
-map: que_ba
-map: que_moc_16
-map: que_moon
-
-// Arunafeltz Seige
-// -- 2007-10-24sdata_k.gpf
-map: arug_cas01
-map: arug_cas02
-map: arug_cas03
-map: arug_cas04
-map: arug_cas05
-map: aru_gld
-
-// PVP Battle Fields: Tierra Valley, and Frebeus
-// -- 2007-11-14sdata_k.gpf
-map: bat_room
-map: bat_a01
-map: bat_a02
-map: bat_b01
-map: bat_b02
-map: que_qsch01
-map: que_qsch02
-map: que_qsch03
-map: que_qsch04
-map: que_qsch05
-map: que_qaru01
-map: que_qaru02
-map: que_qaru03
-map: que_qaru04
-map: que_qaru05
-
-// Memorial Dungeon
-// -- 2007-11-28sdata_k.gpf
-map: 1@cata
-map: 2@cata
-map: e_tower
-map: 1@tower
-map: 2@tower
-map: 3@tower
-map: 4@tower
-map: 5@tower
-map: 6@tower
-
-// 13.1 Another World
-// -- 2008-05-28sdata_k.gpf
-map: mid_camp
-map: mid_campin
-map: man_fild01
-map: man_fild03
-map: spl_fild02
-map: spl_fild03
-map: moc_fild22b
-map: que_dan01
-map: que_dan02
-map: schg_que01
-map: schg_dun01
-map: arug_que01
-map: arug_dun01
-map: 1@orcs
-map: 2@orcs
-
-// Additional Battleground.
-// -- 2008-??-???
-map: bat_c01
-map: bat_c02
-map: bat_c03
-
-// 13.2 Another World
-// -- 2008-11-26
-map: 1@nyd
-map: 2@nyd
-map: nyd_dun01
-map: nyd_dun02
-map: manuk
-map: man_fild02
-map: man_in01
-map: splendide
-map: spl_fild01
-map: spl_in01
-map: spl_in02
-
-// 3rd Job Maps
-// -- 2009-01-29rdata_k2.gpf
-map: job3_arch01
-map: job3_arch02
-map: job3_arch03
-map: job3_guil01
-map: job3_guil02
-map: job3_guil03
-map: job3_rang01
-map: job3_rang02
-map: job3_rune01
-map: job3_rune02
-map: job3_rune03
-map: job3_war01
-map: job3_war02
-map: jupe_core2
-
-// ???
-// -- 2009-05-27rdata_k.gpf
-map: moc_para01
-
-// Brasilis Maps
-// -- 2009-08-05rdata_k.gpf
-map: brasilis
-map: bra_in01
-map: bra_fild01
-map: bra_dun01
-map: bra_dun02
-
-// ???
-// -- 2009-09-30rdata_k.gpf
-map: s_atelier
-
-// 13.3 El Discastes
-// -- 2009-12-09rdata_k.gpf
-map: dicastes01
-map: dicastes02
-map: dic_in01
-map: dic_fild01
-map: dic_fild02
-map: dic_dun01
-map: dic_dun02
-map: job3_gen01
-map: job3_sha01
-
-// Localized Event Maps
-//map: evt_zombie
-//map: evt_coke
-
-// Unknown Maps
-//ac_sl_area
-//ac_cl_hall
-//ac_cl_room
-//jp_s_dun11
-
-// 14.1 Bifrost
-// -- 2010-06-09rdata_x.gpf
-map: mora
-map: bif_fild01
-map: bif_fild02
-map: 1@mist
-
-// Dewata Maps
-// -- 2010-09-15rdata_x.gpf
-map: dewata
-map: dew_in01
-map: dew_fild01
-map: dew_dun01
-map: dew_dun02
-
-// ???
-// -- 2010-10-06rdata_x.gpf
-map: que_house_s
-
-// Malangdo Maps
-// -- 2010-11-03rdata_x.gpf
-map: malangdo
-map: mal_in01
-map: mal_in02
-map: mal_dun01
-map: 1@pump
-map: 2@pump
-map: 1@cash
-
-// Undersea Tunnel Expansion
-// -- 2010-11-10rdata_x.gpf
-map: iz_dun05
-
-// ???
-// -- 2010-12-01data_x.gpf
-map: evt_mobroom
-
-// ???
-map: dic_dun03
-//map: mjolnir_04_1
-//map: evt_swar_b
-//map: evt_swar_r
-//map: evt_swar_s
-//map: evt_swar_t
-
-// Lighthalzen Dungeon F4, Wolfchev's Laboratory
-// -- 2011-03-16rdata_x.gpf
-map: 1@lhz
-map: lhz_dun04
-map: que_lhz
-
-// Hall Of Abyss
-// -- 2011-06-15data_x.gpf
-map: gld_dun01_2
-map: gld_dun02_2
-map: gld_dun03_2
-map: gld_dun04_2
-map: gld2_ald
-map: gld2_gef
-map: gld2_pay
-map: gld2_prt
-
-// Malaya Port
-// -- 2011-08-30data_x.gpf
-map: malaya
-map: ma_fild01
-map: ma_fild02
-map: ma_scene01
-map: ma_in01
-map: ma_dun01
-map: 1@ma_h
-map: 1@ma_c
-map: 1@ma_b
-map: ma_zif01
-map: ma_zif02
-map: ma_zif03
-map: ma_zif04
-map: ma_zif05
-map: ma_zif06
-map: ma_zif07
-map: ma_zif08
-map: ma_zif09
-map: job_ko
-
-// 14.2 Eclage
-// -- 2011-11-30data_x.gpf
-map: eclage
-map: ecl_fild01
-map: ecl_in01
-map: ecl_in02
-map: ecl_in03
-map: ecl_in04
-map: 1@ecl
-map: ecl_tdun01
-map: ecl_tdun02
-map: ecl_tdun03
-map: ecl_tdun04
-map: ecl_hub01
-map: que_avan01
-
-// Pyramids Basement Nightmare Mode
-map: moc_prydn1
-map: moc_prydn2
-
-// ===============================
-// New Maps added 2013-02-10 (Thanks Streusel!)
-// Credits to Baneado for reporting some
-// ===============================
-// Izlude Novice Academy & Tutorial
-map: iz_int
-map: iz_int01
-map: iz_int02
-map: iz_int03
-map: iz_int04
-map: iz_ac01
-map: iz_ac02
-map: iz_ng01
-map: treasure_n1
-map: treasure_n2
-map: iz_ac01_d
-map: iz_ac02_d
-map: iz_ac01_c
-map: iz_ac02_c
-map: iz_ac01_b
-map: iz_ac02_b
-map: iz_ac01_a
-map: iz_ac02_a
-map: izlude_d
-map: izlude_c
-map: izlude_b
-map: izlude_a
-
-map: prt_fild08d
-map: prt_fild08c
-map: prt_fild08b
-map: prt_fild08a
-
-// War of Emperium - Third Edition (TE)
-map: te_prt_gld
-map: te_prtcas01
-map: te_prtcas02
-map: te_prtcas03
-map: te_prtcas04
-map: te_prtcas05
-map: teg_dun01
-map: teg_dun02
-map: te_alde_gld
-map: te_aldecas1
-map: te_aldecas2
-map: te_aldecas3
-map: te_aldecas4
-map: te_aldecas5
-
-// Glast Heim Memorial & Nightmare
-map: gl_cas02_
-map: gl_chyard_
-map: 1@gl_k
-map: 2@gl_k
-
-map: silk_lair
-map: evt_bomb
-
-// Wave Mode Memorial Dungeon
-map: 1@def01
-map: 1@def02
-map: 1@def03
-
-// Heroes' Trails - Part 1
-map: 1@face
-map: 1@sara
-map: 1@tnm1
-map: 1@tnm2
-map: 1@tnm3
-map: 1@ge_st
-map: 1@gef
-map: 1@gef_in
-map: 1@spa
-map: dali
-map: dali02
-
-// Episode 14.3
-map: moro_vol
-map: moro_cav
-map: 1@dth1
-map: 1@dth2
-map: 1@dth3
-map: 1@rev
-map: 1@xm_d
-map: 1@eom
-map: 1@jtb
-
-// Clock Tower Nightmare Mode
-map: c_tower2_
-map: c_tower3_
-
-//------------------------- Clone Maps ---------------------------
-//------------------------- Extra Maps ---------------------------
-
-// Ragnarok World Championship 2004
-// Requires: RWC 2004 Client
-// or Akaru's SuperGRF 1.64 or newer
-//map: rwc01
-//map: rwc02
-//map: rwc03
-
-// Ragnarok World Championship 2009
-// Requires: RWC 2009 Map files
-//map: 2009rwc_f01
-//map: 2009rwc_01
-//map: 2009rwc_02
-//map: 2009rwc_03
-//map: 2009rwc_04
-
-// Ragnarok World Championship 2008?
-// Requires: RWC 2008 Map files?
-//map: 2008rwc_04
-
-//Christmas & Sakura Special
-//Requires Akaru's SuperGRF 1.1 or newer
-//map: prontera_x
-//map: alberta_x
-//map: aldebaran_x
-//map: geffen_x
-//map: izlude_x
-//map: prt_church_x
-//map: prontera_s
-//map: pay_arche_s
-
-//Fenced Lutie
-//Requires Akaru's SuperGRF 1.23 or newer
-//map: xmas_old
-
-//Alpha Maps
-//Requires adata.grf containing alpha maps and data
-//map: fay_vilg00
-//map: fay_vilg01
-//map: gef_vilg00
-//map: gef_vilg01
-//map: moc_dugn01
-//map: moc_dugn02
-//map: moc_fild01
-//map: moc_fild02
-//map: moc_fild03
-//map: moc_fild04
-//map: moc_intr00
-//map: moc_intr01
-//map: moc_intr02
-//map: moc_intr04
-//map: moc_vilg00
-//map: moc_vilg01
-//map: moc_vilg02
-//map: probemap
-//map: probemap02
-//map: prt_cstl01
-//map: prt_dugn00
-//map: prt_dugn01
-//map: prt_fild00
-//map: prt_fild01
-//map: prt_fild03
-//map: prt_fild04
-//map: prt_fild05
-//map: prt_intr01
-//map: prt_intr01_a
-//map: prt_intr02
-//map: prt_vilg00
-//map: prt_vilg01
-//map: prt_vilg02
-//map: tank_test
-//map: tank_test2
-//map: test
diff --git a/src/map/map.c b/src/map/map.c
index 56af8113b..469747eef 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -79,6 +79,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 #ifndef _WIN32
 #include <unistd.h>
 #endif
@@ -3798,143 +3799,333 @@ int map_readallmaps (void) {
 	return 0;
 }
 
-/*==========================================
- * Read map server configuration files (conf/map_server.conf...)
- *------------------------------------------*/
-int map_config_read(char *cfgName) {
-	char line[1024], w1[1024], w2[1024];
-	FILE *fp;
+/**
+ * Reads 'map_configuration/console' and initializes required variables.
+ *
+ * @param filename Path to configuration file (used in error and warning messages).
+ * @param config   The current config being parsed.
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool map_config_read_console(const char *filename, struct config_t *config, bool imported)
+{
+	struct config_setting_t *setting = NULL;
 
-	nullpo_retr(1, cfgName);
+	nullpo_retr(false, filename);
+	nullpo_retr(false, config);
 
-	fp = fopen(cfgName,"r");
-	if( fp == NULL ) {
-		ShowError("Map configuration file not found at: %s\n", cfgName);
-		return 1;
+	if ((setting = libconfig->lookup(config, "map_configuration/console")) == NULL) {
+		if (imported)
+			return true;
+		ShowError("map_config_read: map_configuration/console was not found in %s!\n", filename);
+		return false;
 	}
 
-	while (fgets(line, sizeof(line), fp)) {
-		char* ptr;
+	libconfig->setting_lookup_bool_real(setting, "stdout_with_ansisequence", &showmsg->stdout_with_ansisequence);
+	if (libconfig->setting_lookup_int(setting, "console_silent", &showmsg->silent) == CONFIG_TRUE) {
+		if (showmsg->silent) // only bother if its actually enabled
+			ShowInfo("Console Silent Setting: %d\n", showmsg->silent);
+	}
+	libconfig->setting_lookup_mutable_string(setting, "timestamp_format", showmsg->timestamp_format, sizeof(showmsg->timestamp_format));
+	libconfig->setting_lookup_int(setting, "console_msg_log", &showmsg->console_log);
 
-		if (line[0] == '/' && line[1] == '/')
-			continue;
-		if ((ptr = strstr(line, "//")) != NULL)
-			*ptr = '\n'; //Strip comments
-		if (sscanf(line, "%1023[^:]: %1023[^\t\r\n]", w1, w2) < 2)
-			continue;
+	return true;
+}
 
-		//Strip trailing spaces
-		ptr = w2 + strlen(w2);
-		while (--ptr >= w2 && *ptr == ' ');
-		ptr++;
-		*ptr = '\0';
+/**
+ * Reads 'map_configuration/sql_connection' and initializes required variables.
+ *
+ * @param filename Path to configuration file (used in error and warning messages).
+ * @param config   The current config being parsed.
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool map_config_read_connection(const char *filename, struct config_t *config, bool imported)
+{
+	struct config_setting_t *setting = NULL;
 
-		if(strcmpi(w1,"timestamp_format")==0)
-			safestrncpy(showmsg->timestamp_format, w2, 20);
-		else if(strcmpi(w1,"stdout_with_ansisequence")==0)
-			showmsg->stdout_with_ansisequence = config_switch(w2) ? true : false;
-		else if(strcmpi(w1,"console_silent")==0) {
-			showmsg->silent = atoi(w2);
-			if (showmsg->silent) // only bother if its actually enabled
-				ShowInfo("Console Silent Setting: %d\n", atoi(w2));
-		} else if (strcmpi(w1, "userid")==0)
-			chrif->setuserid(w2);
-		else if (strcmpi(w1, "passwd") == 0)
-			chrif->setpasswd(w2);
-		else if (strcmpi(w1, "char_ip") == 0)
-			map->char_ip_set = chrif->setip(w2);
-		else if (strcmpi(w1, "char_port") == 0)
-			chrif->setport(atoi(w2));
-		else if (strcmpi(w1, "map_ip") == 0)
-			map->ip_set = clif->setip(w2);
-		else if (strcmpi(w1, "bind_ip") == 0)
-			clif->setbindip(w2);
-		else if (strcmpi(w1, "map_port") == 0) {
-			clif->setport(atoi(w2));
-			map->port = (atoi(w2));
-		} else if (strcmpi(w1, "map") == 0)
-			map->count++;
-		else if (strcmpi(w1, "delmap") == 0)
-			map->count--;
-		else if (strcmpi(w1, "npc") == 0)
-			npc->addsrcfile(w2);
-		else if (strcmpi(w1, "delnpc") == 0)
-			npc->delsrcfile(w2);
-		else if (strcmpi(w1, "autosave_time") == 0) {
-			map->autosave_interval = atoi(w2);
-			if (map->autosave_interval < 1) //Revert to default saving.
-				map->autosave_interval = DEFAULT_AUTOSAVE_INTERVAL;
-			else
-				map->autosave_interval *= 1000; //Pass from sec to ms
-		} else if (strcmpi(w1, "minsave_time") == 0) {
-			map->minsave_interval= atoi(w2);
-			if (map->minsave_interval < 1)
-				map->minsave_interval = 1;
-		} else if (strcmpi(w1, "save_settings") == 0)
-			map->save_settings = atoi(w2);
-		else if (strcmpi(w1, "help_txt") == 0)
-			strcpy(map->help_txt, w2);
-		else if (strcmpi(w1, "help2_txt") == 0)
-			strcpy(map->help2_txt, w2);
-		else if (strcmpi(w1, "charhelp_txt") == 0)
-			strcpy(map->charhelp_txt, w2);
-		else if(strcmpi(w1,"db_path") == 0)
-			safestrncpy(map->db_path,w2,255);
-		else if (strcmpi(w1, "enable_spy") == 0)
-			map->enable_spy = config_switch(w2);
-		else if (strcmpi(w1, "use_grf") == 0)
-			map->enable_grf = config_switch(w2);
-		else if (strcmpi(w1, "console_msg_log") == 0)
-			showmsg->console_log = atoi(w2);//[Ind]
-		else if (strcmpi(w1, "default_language") == 0)
-			safestrncpy(map->default_lang_str, w2, sizeof(map->default_lang_str));
-		else if (strcmpi(w1, "import") == 0)
-			map->config_read(w2);
+	nullpo_retr(false, filename);
+	nullpo_retr(false, config);
+
+	if ((setting = libconfig->lookup(config, "map_configuration/sql_connection")) == NULL) {
+		if (imported)
+			return true;
+		ShowError("map_config_read: map_configuration/sql_connection was not found in %s!\n", filename);
+		ShowWarning("map_config_read_connection: Defaulting sql_connection...\n");
+		return false;
+	}
+
+	libconfig->setting_lookup_int(setting, "db_port", &map->server_port);
+	libconfig->setting_lookup_mutable_string(setting, "db_hostname", map->server_ip, sizeof(map->server_ip));
+	libconfig->setting_lookup_mutable_string(setting, "db_username", map->server_id, sizeof(map->server_id));
+	libconfig->setting_lookup_mutable_string(setting, "db_password", map->server_pw, sizeof(map->server_pw));
+	libconfig->setting_lookup_mutable_string(setting, "db_database", map->server_db, sizeof(map->server_db));
+	libconfig->setting_lookup_mutable_string(setting, "default_codepage", map->default_codepage, sizeof(map->default_codepage));
+	return true;
+}
+
+/**
+ * Reads 'map_configuration/inter' and initializes required variables.
+ *
+ * @param filename Path to configuration file (used in error and warning messages).
+ * @param config   The current config being parsed.
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool map_config_read_inter(const char *filename, struct config_t *config, bool imported)
+{
+	struct config_setting_t *setting = NULL;
+	const char *str = NULL;
+	char temp[24];
+	uint16 port;
+
+	nullpo_retr(false, filename);
+	nullpo_retr(false, config);
+
+	if ((setting = libconfig->lookup(config, "map_configuration/inter")) == NULL) {
+		if (imported)
+			return true;
+		ShowError("map_config_read: map_configuration/inter was not found in %s!\n", filename);
+		return false;
+	}
+
+	// Login information
+	if (libconfig->setting_lookup_mutable_string(setting, "userid", temp, sizeof(temp)) == CONFIG_TRUE)
+		chrif->setuserid(temp);
+	if (libconfig->setting_lookup_mutable_string(setting, "passwd", temp, sizeof(temp)) == CONFIG_TRUE)
+		chrif->setpasswd(temp);
+
+	// Char and map-server information
+	if (libconfig->setting_lookup_string(setting, "char_ip", &str) == CONFIG_TRUE)
+		map->char_ip_set = chrif->setip(str);
+	if (libconfig->setting_lookup_uint16(setting, "char_port", &port) == CONFIG_TRUE)
+		chrif->setport(port);
+
+	if (libconfig->setting_lookup_string(setting, "map_ip", &str) == CONFIG_TRUE)
+		map->ip_set = clif->setip(str);
+	if (libconfig->setting_lookup_uint16(setting, "map_port", &port) == CONFIG_TRUE) {
+		clif->setport(port);
+		map->port = port;
+	}
+	if (libconfig->setting_lookup_string(setting, "bind_ip", &str) == CONFIG_TRUE)
+		clif->setbindip(str);
+
+	return true;
+}
+
+/**
+ * Reads 'map_configuration/database' and initializes required variables
+ *
+ * @param filename Path to configuration file (used in error and warning messages).
+ * @param config   The current config being parsed.
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool map_config_read_database(const char *filename, struct config_t *config, bool imported)
+{
+	struct config_setting_t *setting = NULL;
+
+	nullpo_retr(false, filename);
+	nullpo_retr(false, config);
+
+	if ((setting = libconfig->lookup(config, "map_configuration/database")) == NULL) {
+		if (imported)
+			return true;
+		ShowError("map_config_read: map_configuration/database was not found in %s!\n", filename);
+		return false;
+	}
+	libconfig->setting_lookup_mutable_string(setting, "db_path", map->db_path, sizeof(map->db_path));
+	libconfig->setting_lookup_int(setting, "save_settings", &map->save_settings);
+
+	if (libconfig->setting_lookup_int(setting, "autosave_time", &map->autosave_interval) == CONFIG_TRUE) {
+		if (map->autosave_interval < 1) // Revert to default saving
+			map->autosave_interval = DEFAULT_AUTOSAVE_INTERVAL;
 		else
-			ShowWarning("Unknown setting '%s' in file %s\n", w1, cfgName);
+			map->autosave_interval *= 1000; // Pass from s to ms
+	}
+	if (libconfig->setting_lookup_int(setting, "minsave_time", &map->minsave_interval) == CONFIG_TRUE) {
+		if (map->minsave_interval < 1)
+			map->minsave_interval = 1;
 	}
 
-	fclose(fp);
-	return 0;
+	return true;
 }
-int map_config_read_sub(char *cfgName) {
-	char line[1024], w1[1024], w2[1024];
-	FILE *fp;
 
-	nullpo_retr(1, cfgName);
-	fp = fopen(cfgName,"r");
-	if (fp == NULL) {
-		ShowError("Map configuration file not found at: %s\n", cfgName);
-		return 1;
+/**
+ * Reads 'map_configuration/map_list' and initializes required variables
+ *
+ * @param filename Path to configuration file (used in error and warning messages).
+ * @param config   The current config being parsed.
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool map_config_read_map_list(const char *filename, struct config_t *config, bool imported)
+{
+	// FIXME: There's no need to run this separately anymore (it can be done in one step when loading the maps)
+	struct config_setting_t *setting = NULL;
+	int count;
+
+	nullpo_retr(false, filename);
+	nullpo_retr(false, config);
+
+	if ((setting = libconfig->lookup(config, "map_configuration/map_list")) == NULL) {
+		if (imported)
+			return true;
+		ShowError("map_config_read: map_configuration/map_list was not found in %s!\n", filename);
+		return false;
 	}
 
-	while (fgets(line, sizeof(line), fp)) {
-		char* ptr;
+	count = libconfig->setting_length(setting);
+	if (count == 0) {
+		ShowWarning("map_config_read: no maps found in %s!\n", filename);
+		return false;
+	}
+	map->count += count;
 
-		if (line[0] == '/' && line[1] == '/')
+	// Find how many maps should be removed
+	if ((setting = libconfig->lookup(config, "map_configuration/map_removed")) != NULL) {
+		if ((count = libconfig->setting_length(setting)) > 0)
+			map->count -= count;
+	}
+
+	return true;
+}
+
+/**
+ * Reads 'map_configuration/map_list'/'map_configuration/map_removed' and adds
+ * or removes maps from map-server.
+ *
+ * @param filename Path to configuration file (used in error and warning messages).
+ *
+ * @retval false in case of error.
+ */
+bool map_config_read_sub(char *filename)
+{
+	// FIXME: This should be called by map->config_read, rather than re-opening the file!
+	struct config_t config;
+	struct config_setting_t *setting = NULL;
+	int i, count = 0;
+	struct DBMap *deleted_maps;
+
+	nullpo_retr(false, filename);
+
+	if (!libconfig->load_file(&config, filename))
+		return false;
+
+	deleted_maps = strdb_alloc(DB_OPT_DUP_KEY|DB_OPT_RELEASE_KEY, MAP_NAME_LENGTH);
+
+	// Remove maps
+	if ((setting = libconfig->lookup(&config, "map_configuration/map_removed")) != NULL) {
+		count = libconfig->setting_length(setting);
+		for (i = 0; i < count; i++) {
+			const char *mapname;
+
+			if ((mapname = libconfig->setting_get_string_elem(setting, i)) == NULL || mapname[0] == '\0')
+				continue;
+
+			strdb_put(deleted_maps, mapname, NULL);
+			// map->delmap is not used because the map is removed from the list before it's added [Panikon]
+			// map->delmap(mapname);
+		}
+	}
+
+	if ((setting = libconfig->lookup(&config, "map_configuration/map_list")) == NULL) {
+		ShowError("map_config_read_sub: map_configuration/map_list was not found in %s!\n", filename);
+		db_destroy(deleted_maps);
+		libconfig->destroy(&config);
+		return false;
+	}
+
+	// Add maps to map->list
+	count = libconfig->setting_length(setting);
+	if (count <= 0) {
+		ShowWarning("map_config_read_sub: no maps found in %s!\n", filename);
+		db_destroy(deleted_maps);
+		libconfig->destroy(&config);
+		return false;
+	}
+	for (i = 0; i < count; i++) {
+		const char *mapname;
+
+		if ((mapname = libconfig->setting_get_string_elem(setting, i)) == NULL || mapname[0] == '\0')
 			continue;
-		if ((ptr = strstr(line, "//")) != NULL)
-			*ptr = '\n'; //Strip comments
-		if (sscanf(line, "%1023[^:]: %1023[^\t\r\n]", w1, w2) < 2)
+
+		if (strdb_exists(deleted_maps, mapname))
 			continue;
 
-		//Strip trailing spaces
-		ptr = w2 + strlen(w2);
-		while (--ptr >= w2 && *ptr == ' ');
-		ptr++;
-		*ptr = '\0';
+		map->addmap(mapname);
+	}
 
-		if (strcmpi(w1, "map") == 0)
-			map->addmap(w2);
-		else if (strcmpi(w1, "delmap") == 0)
-			map->delmap(w2);
-		else if (strcmpi(w1, "import") == 0)
-			map->config_read_sub(w2);
+	db_destroy(deleted_maps);
+	libconfig->destroy(&config);
+	return true;
+}
+
+/**
+ * Reads map-server configuration files (map-server.conf) and initialises
+ * required variables.
+ *
+ * @param filename Path to configuration file.
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool map_config_read(const char *filename, bool imported)
+{
+	struct config_t config;
+	struct config_setting_t *setting = NULL;
+	const char *import = NULL;
+	bool retval = true;
+
+	nullpo_retr(false, filename);
+
+	if (!libconfig->load_file(&config, filename))
+		return false;
+
+	if ((setting = libconfig->lookup(&config, "map_configuration")) == NULL) {
+		libconfig->destroy(&config);
+		if (imported)
+			return true;
+		ShowError("map_config_read: map_configuration was not found in %s!\n", filename);
+		return false;
 	}
 
-	fclose(fp);
-	return 0;
+	libconfig->setting_lookup_mutable_string(setting, "help_txt", map->help_txt, sizeof(map->help_txt));
+	libconfig->setting_lookup_mutable_string(setting, "charhelp_txt", map->charhelp_txt, sizeof(map->charhelp_txt));
+	libconfig->setting_lookup_bool(setting, "enable_spy", &map->enable_spy);
+	libconfig->setting_lookup_bool(setting, "use_grf", &map->enable_grf);
+	libconfig->setting_lookup_mutable_string(setting, "default_language", map->default_lang_str, sizeof(map->default_lang_str));
+
+	if (!map_config_read_console(filename, &config, imported))
+		retval = false;
+	if (!map_config_read_connection(filename, &config, imported))
+		retval = false;
+	if (!map_config_read_inter(filename, &config, imported))
+		retval = false;
+	if (!map_config_read_database(filename, &config, imported))
+		retval = false;
+	if (!map_config_read_map_list(filename, &config, imported))
+		retval = false;
+
+	// import should overwrite any previous configuration, so it should be called last
+	if (libconfig->lookup_string(&config, "import", &import) == CONFIG_TRUE) {
+		if (strcmp(import, filename) == 0 || strcmp(import, map->MAP_CONF_NAME) == 0) {
+			ShowWarning("map_config_read: Loop detected! Skipping 'import'...\n");
+		} else {
+			if (!map->config_read(import, true))
+				retval = false;
+		}
+	}
+
+	libconfig->destroy(&config);
+	return retval;
 }
+
 void map_reloadnpc_sub(char *cfgName) {
 	char line[1024], w1[1024], w2[1024];
 	FILE *fp;
@@ -6141,7 +6332,7 @@ int do_init(int argc, char *argv[])
 
 	map->INTER_CONF_NAME         = aStrdup("conf/common/inter-server.conf");
 	map->LOG_CONF_NAME           = aStrdup("conf/logs.conf");
-	map->MAP_CONF_NAME           = aStrdup("conf/map-server.conf");
+	map->MAP_CONF_NAME           = aStrdup("conf/map/map-server.conf");
 	map->BATTLE_CONF_FILENAME    = aStrdup("conf/battle.conf");
 	map->ATCOMMAND_CONF_FILENAME = aStrdup("conf/atcommand.conf");
 	map->SCRIPT_CONF_NAME        = aStrdup("conf/script.conf");
@@ -6157,11 +6348,30 @@ int do_init(int argc, char *argv[])
 	cmdline->exec(argc, argv, CMDLINE_OPT_NORMAL);
 	minimal = map->minimal;/* temp (perhaps make minimal a mask with options of what to load? e.g. plugin 1 does minimal |= mob_db; */
 	if (!minimal) {
-		map->config_read(map->MAP_CONF_NAME);
+		map->config_read(map->MAP_CONF_NAME, false);
 		CREATE(map->list,struct map_data,map->count);
 		map->count = 0;
 		map->config_read_sub(map->MAP_CONF_NAME);
 
+		{
+			// TODO: Remove this when no longer needed.
+#define CHECK_OLD_LOCAL_CONF(oldname, newname) do { \
+	if (stat((oldname), &fileinfo) == 0 && fileinfo.st_size > 0) { \
+		ShowWarning("An old configuration file \"%s\" was found.\n", (oldname)); \
+		ShowWarning("If it contains settings you wish to keep, please merge them into \"%s\".\n", (newname)); \
+		ShowWarning("Otherwise, just delete it.\n"); \
+		ShowInfo("Resuming in 10 seconds...\n"); \
+		HSleep(10); \
+	} \
+} while (0)
+		struct stat fileinfo;
+
+		CHECK_OLD_LOCAL_CONF("conf/import/map_conf.txt", "conf/import/map-server.conf");
+		CHECK_OLD_LOCAL_CONF("conf/import/inter_conf.txt", "conf/import/inter-server.conf");
+
+#undef CHECK_OLD_LOCAL_CONF
+		}
+
 		// loads npcs
 		map->reloadnpc(false);
 
@@ -6172,7 +6382,7 @@ int do_init(int argc, char *argv[])
 			sockt->ip2str(sockt->addr_[0], ip_str);
 
 #ifndef BUILDBOT
-			ShowWarning("Not all IP addresses in /conf/map-server.conf configured, auto-detecting...\n");
+			ShowWarning("Not all IP addresses in /conf/map/map-server.conf configured, auto-detecting...\n");
 #endif
 
 			if (sockt->naddr_ == 0)
@@ -6337,7 +6547,6 @@ void map_defaults(void) {
 
 	sprintf(map->db_path ,"db");
 	sprintf(map->help_txt ,"conf/help.txt");
-	sprintf(map->help2_txt ,"conf/help2.txt");
 	sprintf(map->charhelp_txt ,"conf/charhelp.txt");
 
 	sprintf(map->wisp_server_name ,"Server"); // can be modified in char-server configuration file
@@ -6352,7 +6561,7 @@ void map_defaults(void) {
 
 	map->INTER_CONF_NAME="conf/common/inter-server.conf";
 	map->LOG_CONF_NAME="conf/logs.conf";
-	map->MAP_CONF_NAME = "conf/map-server.conf";
+	map->MAP_CONF_NAME = "conf/map/map-server.conf";
 	map->BATTLE_CONF_FILENAME = "conf/battle.conf";
 	map->ATCOMMAND_CONF_FILENAME = "conf/atcommand.conf";
 	map->SCRIPT_CONF_NAME = "conf/script.conf";
diff --git a/src/map/map.h b/src/map/map.h
index f98e1cb7f..646e39448 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -968,7 +968,6 @@ struct map_interface {
 	char db_path[256];
 
 	char help_txt[256];
-	char help2_txt[256];
 	char charhelp_txt[256];
 
 	char wisp_server_name[NAME_LENGTH];
@@ -997,7 +996,7 @@ struct map_interface {
 	char server_db[32];
 	struct Sql *mysql_handle;
 
-	int port;
+	uint16 port;
 	int users;
 	int enable_grf; //To enable/disable reading maps from GRF files, bypassing mapcache [blackhole89]
 	bool ip_set;
@@ -1188,8 +1187,8 @@ END_ZEROED_BLOCK;
 	int (*waterheight) (char *mapname);
 	int (*readgat) (struct map_data *m);
 	int (*readallmaps) (void);
-	int (*config_read) (char *cfgName);
-	int (*config_read_sub) (char *cfgName);
+	bool (*config_read) (const char *filename, bool imported);
+	bool (*config_read_sub) (char *filename);
 	void (*reloadnpc_sub) (char *cfgName);
 	bool (*inter_config_read) (const char *filename, bool imported);
 	bool (*inter_config_read_database_names) (const char *filename, const struct config_t *config, bool imported);
diff --git a/tools/configconverter.pl b/tools/configconverter.pl
index 435e4b246..2d5eebe72 100755
--- a/tools/configconverter.pl
+++ b/tools/configconverter.pl
@@ -169,6 +169,12 @@ sub printcfg_int($$$) {
 	indent("$variable: $value\n", $nestlevel);
 }
 
+sub printcfg_hexint($$$) {
+	my ($variable, $value, $nestlevel) = @_;
+
+	indent(sprintf("%s: 0x%x\n", $variable, $value), $nestlevel);
+}
+
 sub printcfg_bool($$$) {
 	my ($variable, $value, $nestlevel) = @_;
 
@@ -441,7 +447,34 @@ my @defaults = (
 			'account.sql.accreg_db'                   => {parse => \&parsecfg_string,    print => \&printcfg_nil,     path => "", default => "global_reg_value"},
 			import                                    => {parse => \&parsecfg_stringarr, print => \&printcfg_nil,     path => "", default => ["conf/inter-server.conf", "conf/import/login_conf.txt"]},
 		}
-	}
+	},
+	{
+		files => ['map-server.conf', 'import/map_conf.txt'],
+		settings => {
+			userid                   => {parse => \&parsecfg_string,    print => \&printcfg_string, path => "map-server:map_configuration/inter/", default => "s1"},
+			passwd                   => {parse => \&parsecfg_string,    print => \&printcfg_string, path => "map-server:map_configuration/inter/", default => "p1"},
+			char_ip                  => {parse => \&parsecfg_string,    print => \&printcfg_string, path => "map-server:map_configuration/inter/", default => "127.0.0.1"},
+			bind_ip                  => {parse => \&parsecfg_string,    print => \&printcfg_string, path => "map-server:map_configuration/inter/", default => "127.0.0.1"},
+			char_port                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "map-server:map_configuration/inter/", default => 6121},
+			map_ip                   => {parse => \&parsecfg_string,    print => \&printcfg_string, path => "map-server:map_configuration/inter/", default => "127.0.0.1"},
+			map_port                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "map-server:map_configuration/inter/", default => 5121},
+			timestamp_format         => {parse => \&parsecfg_string,    print => \&printcfg_string, path => "console:console/", default => "[%d/%b %H:%M]"},
+			stdout_with_ansisequence => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "console:console/", default => "false"},
+			console_msg_log          => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "console:console/", default => 0},
+			console_silent           => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "console:console/", default => 0},
+			db_path                  => {parse => \&parsecfg_string,    print => \&printcfg_string, path => "map-server:map_configuration/database/", default => "db"},
+			enable_spy               => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "map-server:map_configuration/", default => "false"},
+			use_grf                  => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "map-server:map_configuration/", default => "false"},
+			autosave_time            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "map-server:map_configuration/database/", default => 300},
+			minsave_time             => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "map-server:map_configuration/database/", default => 100},
+			save_settings            => {parse => \&parsecfg_int,       print => \&printcfg_hexint, path => "map-server:map_configuration/database/", default => 511},
+			default_language         => {parse => \&parsecfg_string,    print => \&printcfg_string, path => "map-server:map_configuration/", default => "English"},
+			help_txt                 => {parse => \&parsecfg_string,    print => \&printcfg_string, path => "map-server:map_configuration/", default => "conf/help.txt"},
+			charhelp_txt             => {parse => \&parsecfg_string,    print => \&printcfg_string, path => "map-server:map_configuration/", default => "conf/charhelp.txt"},
+			help2_txt                => {parse => \&parsecfg_string,    print => \&printcfg_nil,    path => "", default => "conf/help2.txt"},
+			import                   => {parse => \&parsecfg_stringarr, print => \&printcfg_nil,    path => "", default => ["conf/maps.conf", "conf/import/map_conf.txt"]},
+		}
+	},
 );
 
 for (@ARGV) {
-- 
cgit v1.2.3-70-g09d2


From 86dde2472e4752b44a14e1d37a9b6288c06f3c00 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Thu, 11 Feb 2016 15:15:33 +0100
Subject: Improved map list loading

There's no need to parse the map list twice anymore

Signed-off-by: Haru <haru@dotalux.com>
---
 src/map/map.c | 107 ++++++++++++++++++++++++----------------------------------
 src/map/map.h |   3 +-
 2 files changed, 46 insertions(+), 64 deletions(-)

(limited to 'src/map')

diff --git a/src/map/map.c b/src/map/map.c
index 469747eef..37885cd0b 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3331,20 +3331,42 @@ int map_readfromcache(struct map_data *m, char *buffer) {
 	return 0; // Not found
 }
 
-int map_addmap(const char* mapname) {
+/**
+ * Adds a new empty map to the map list.
+ *
+ * Assumes that there's enough space in the map list.
+ *
+ * @param mapname The new map's name.
+ * @return success state.
+ */
+int map_addmap(const char *mapname)
+{
 	map->list[map->count].instance_id = -1;
 	mapindex->getmapname(mapname, map->list[map->count++].name);
 	return 0;
 }
 
-void map_delmapid(int id) {
+/**
+ * Removes a map from the map list.
+ *
+ * @param id The map ID.
+ */
+void map_delmapid(int id)
+{
 	Assert_retv(id >= 0 && id < map->count);
 	ShowNotice("Removing map [ %s ] from maplist"CL_CLL"\n",map->list[id].name);
 	memmove(map->list+id, map->list+id+1, sizeof(map->list[0])*(map->count-id-1));
 	map->count--;
 }
 
-int map_delmap(char* mapname) {
+/**
+ * Removes a map fromt he map list.
+ *
+ * @param mapname The name of the map to remove.
+ * @return the number of removed maps.
+ */
+int map_delmap(const char *mapname)
+{
 	int i;
 	char map_name[MAP_NAME_LENGTH];
 
@@ -3956,7 +3978,8 @@ bool map_config_read_database(const char *filename, struct config_t *config, boo
 }
 
 /**
- * Reads 'map_configuration/map_list' and initializes required variables
+ * Reads 'map_configuration/map_list'/'map_configuration/map_removed' and adds
+ * or removes maps from map-server.
  *
  * @param filename Path to configuration file (used in error and warning messages).
  * @param config   The current config being parsed.
@@ -3966,61 +3989,17 @@ bool map_config_read_database(const char *filename, struct config_t *config, boo
  */
 bool map_config_read_map_list(const char *filename, struct config_t *config, bool imported)
 {
-	// FIXME: There's no need to run this separately anymore (it can be done in one step when loading the maps)
-	struct config_setting_t *setting = NULL;
-	int count;
-
-	nullpo_retr(false, filename);
-	nullpo_retr(false, config);
-
-	if ((setting = libconfig->lookup(config, "map_configuration/map_list")) == NULL) {
-		if (imported)
-			return true;
-		ShowError("map_config_read: map_configuration/map_list was not found in %s!\n", filename);
-		return false;
-	}
-
-	count = libconfig->setting_length(setting);
-	if (count == 0) {
-		ShowWarning("map_config_read: no maps found in %s!\n", filename);
-		return false;
-	}
-	map->count += count;
-
-	// Find how many maps should be removed
-	if ((setting = libconfig->lookup(config, "map_configuration/map_removed")) != NULL) {
-		if ((count = libconfig->setting_length(setting)) > 0)
-			map->count -= count;
-	}
-
-	return true;
-}
-
-/**
- * Reads 'map_configuration/map_list'/'map_configuration/map_removed' and adds
- * or removes maps from map-server.
- *
- * @param filename Path to configuration file (used in error and warning messages).
- *
- * @retval false in case of error.
- */
-bool map_config_read_sub(char *filename)
-{
-	// FIXME: This should be called by map->config_read, rather than re-opening the file!
-	struct config_t config;
 	struct config_setting_t *setting = NULL;
 	int i, count = 0;
 	struct DBMap *deleted_maps;
 
 	nullpo_retr(false, filename);
-
-	if (!libconfig->load_file(&config, filename))
-		return false;
+	nullpo_retr(false, config);
 
 	deleted_maps = strdb_alloc(DB_OPT_DUP_KEY|DB_OPT_RELEASE_KEY, MAP_NAME_LENGTH);
 
 	// Remove maps
-	if ((setting = libconfig->lookup(&config, "map_configuration/map_removed")) != NULL) {
+	if ((setting = libconfig->lookup(config, "map_configuration/map_removed")) != NULL) {
 		count = libconfig->setting_length(setting);
 		for (i = 0; i < count; i++) {
 			const char *mapname;
@@ -4029,26 +4008,33 @@ bool map_config_read_sub(char *filename)
 				continue;
 
 			strdb_put(deleted_maps, mapname, NULL);
-			// map->delmap is not used because the map is removed from the list before it's added [Panikon]
-			// map->delmap(mapname);
+
+			if (imported) // Map list is empty on the first run, only do this for imported files.
+				map->delmap(mapname);
 		}
 	}
 
-	if ((setting = libconfig->lookup(&config, "map_configuration/map_list")) == NULL) {
-		ShowError("map_config_read_sub: map_configuration/map_list was not found in %s!\n", filename);
+	if ((setting = libconfig->lookup(config, "map_configuration/map_list")) == NULL) {
 		db_destroy(deleted_maps);
-		libconfig->destroy(&config);
+		if (imported)
+			return true;
+		ShowError("map_config_read_map_list: map_configuration/map_list was not found in %s!\n", filename);
 		return false;
 	}
 
 	// Add maps to map->list
 	count = libconfig->setting_length(setting);
+
 	if (count <= 0) {
-		ShowWarning("map_config_read_sub: no maps found in %s!\n", filename);
 		db_destroy(deleted_maps);
-		libconfig->destroy(&config);
+		if (imported)
+			return true;
+		ShowWarning("map_config_read_map_list: no maps found in %s!\n", filename);
 		return false;
 	}
+
+	RECREATE(map->list, struct map_data, map->count + count); // TODO: VECTOR candidate
+
 	for (i = 0; i < count; i++) {
 		const char *mapname;
 
@@ -4061,8 +4047,9 @@ bool map_config_read_sub(char *filename)
 		map->addmap(mapname);
 	}
 
+	RECREATE(map->list, struct map_data, map->count);
+
 	db_destroy(deleted_maps);
-	libconfig->destroy(&config);
 	return true;
 }
 
@@ -6349,9 +6336,6 @@ int do_init(int argc, char *argv[])
 	minimal = map->minimal;/* temp (perhaps make minimal a mask with options of what to load? e.g. plugin 1 does minimal |= mob_db; */
 	if (!minimal) {
 		map->config_read(map->MAP_CONF_NAME, false);
-		CREATE(map->list,struct map_data,map->count);
-		map->count = 0;
-		map->config_read_sub(map->MAP_CONF_NAME);
 
 		{
 			// TODO: Remove this when no longer needed.
@@ -6770,7 +6754,6 @@ void map_defaults(void) {
 	map->readgat = map_readgat;
 	map->readallmaps = map_readallmaps;
 	map->config_read = map_config_read;
-	map->config_read_sub = map_config_read_sub;
 	map->reloadnpc_sub = map_reloadnpc_sub;
 	map->inter_config_read = inter_config_read;
 	map->inter_config_read_database_names = inter_config_read_database_names;
diff --git a/src/map/map.h b/src/map/map.h
index 646e39448..6514ef0af 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -1147,7 +1147,7 @@ END_ZEROED_BLOCK;
 
 	int (*cleanup_sub) (struct block_list *bl, va_list ap);
 
-	int (*delmap) (char* mapname);
+	int (*delmap) (const char *mapname);
 	void (*flags_init) (void);
 
 	bool (*iwall_set) (int16 m, int16 x, int16 y, int size, int8 dir, bool shootable, const char* wall_name);
@@ -1188,7 +1188,6 @@ END_ZEROED_BLOCK;
 	int (*readgat) (struct map_data *m);
 	int (*readallmaps) (void);
 	bool (*config_read) (const char *filename, bool imported);
-	bool (*config_read_sub) (char *filename);
 	void (*reloadnpc_sub) (char *cfgName);
 	bool (*inter_config_read) (const char *filename, bool imported);
 	bool (*inter_config_read_database_names) (const char *filename, const struct config_t *config, bool imported);
-- 
cgit v1.2.3-70-g09d2


From 5b983fc43b2f632a51ddbeef360e2462ad3ca055 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Thu, 11 Feb 2016 16:35:08 +0100
Subject: Ported npc config to libconfig

Ported to modern Hercules and cleaned up from Panikon's commits: ca009582cb22340951aa3e86c044ec1dca05df36, 6d6adf9bab2ba6f4274395018b8def566b880197

Signed-off-by: Haru <haru@dotalux.com>
---
 npc/pre-re/scripts.conf          | 126 +++++------
 npc/pre-re/scripts_jobs.conf     |  18 +-
 npc/pre-re/scripts_main.conf     |  73 +++----
 npc/pre-re/scripts_monsters.conf | 128 ++++++------
 npc/pre-re/scripts_warps.conf    |  30 +--
 npc/re/scripts.conf              | 252 +++++++++++-----------
 npc/re/scripts_jobs.conf         |  50 ++---
 npc/re/scripts_main.conf         |  77 +++----
 npc/re/scripts_mapflags.conf     |   4 +-
 npc/re/scripts_monsters.conf     | 154 +++++++-------
 npc/re/scripts_warps.conf        |  66 +++---
 npc/re/scripts_woe.conf          |   6 +-
 npc/scripts.conf                 | 436 +++++++++++++++++++--------------------
 npc/scripts_custom.conf          | 134 ++++++------
 npc/scripts_dev.conf             |   4 +-
 npc/scripts_jobs.conf            | 106 +++++-----
 npc/scripts_mapflags.conf        |  60 +++---
 npc/scripts_monsters.conf        |  10 +-
 npc/scripts_removed.conf         |  37 ++++
 npc/scripts_warps.conf           | 158 +++++++-------
 npc/scripts_woe.conf             |  74 +++----
 src/map/map.c                    | 117 +++++++----
 src/map/map.h                    |   2 +-
 23 files changed, 1106 insertions(+), 1016 deletions(-)
 create mode 100644 npc/scripts_removed.conf

(limited to 'src/map')

diff --git a/npc/pre-re/scripts.conf b/npc/pre-re/scripts.conf
index ad6407503..d00d6ffba 100644
--- a/npc/pre-re/scripts.conf
+++ b/npc/pre-re/scripts.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -29,84 +29,84 @@
 //=========================================================================
 
 //================= Airport ===============================================
-npc: npc/pre-re/airports/izlude.txt
+"npc/pre-re/airports/izlude.txt",
 
 //================= Cities ================================================
-npc: npc/pre-re/cities/alberta.txt
-npc: npc/pre-re/cities/izlude.txt
-npc: npc/pre-re/cities/jawaii.txt
-npc: npc/pre-re/cities/yuno.txt
+"npc/pre-re/cities/alberta.txt",
+"npc/pre-re/cities/izlude.txt",
+"npc/pre-re/cities/jawaii.txt",
+"npc/pre-re/cities/yuno.txt",
 
 //================= Guides ================================================
-npc: npc/pre-re/guides/guides_alberta.txt
-npc: npc/pre-re/guides/guides_aldebaran.txt
-npc: npc/pre-re/guides/guides_amatsu.txt
-npc: npc/pre-re/guides/guides_ayothaya.txt
-npc: npc/pre-re/guides/guides_comodo.txt
-npc: npc/pre-re/guides/guides_einbroch.txt
-npc: npc/pre-re/guides/guides_geffen.txt
-npc: npc/pre-re/guides/guides_gonryun.txt
-npc: npc/pre-re/guides/guides_hugel.txt
-npc: npc/pre-re/guides/guides_izlude.txt
-npc: npc/pre-re/guides/guides_juno.txt
-npc: npc/pre-re/guides/guides_lighthalzen.txt
-npc: npc/pre-re/guides/guides_louyang.txt
-npc: npc/pre-re/guides/guides_morroc.txt
-npc: npc/pre-re/guides/guides_moscovia.txt
-npc: npc/pre-re/guides/guides_niflheim.txt
-npc: npc/pre-re/guides/guides_payon.txt
-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
+"npc/pre-re/guides/guides_alberta.txt",
+"npc/pre-re/guides/guides_aldebaran.txt",
+"npc/pre-re/guides/guides_amatsu.txt",
+"npc/pre-re/guides/guides_ayothaya.txt",
+"npc/pre-re/guides/guides_comodo.txt",
+"npc/pre-re/guides/guides_einbroch.txt",
+"npc/pre-re/guides/guides_geffen.txt",
+"npc/pre-re/guides/guides_gonryun.txt",
+"npc/pre-re/guides/guides_hugel.txt",
+"npc/pre-re/guides/guides_izlude.txt",
+"npc/pre-re/guides/guides_juno.txt",
+"npc/pre-re/guides/guides_lighthalzen.txt",
+"npc/pre-re/guides/guides_louyang.txt",
+"npc/pre-re/guides/guides_morroc.txt",
+"npc/pre-re/guides/guides_moscovia.txt",
+"npc/pre-re/guides/guides_niflheim.txt",
+"npc/pre-re/guides/guides_payon.txt",
+"npc/pre-re/guides/guides_prontera.txt",
+"npc/pre-re/guides/guides_rachel.txt",
+"npc/pre-re/guides/guides_umbala.txt",
+"npc/pre-re/guides/guides_veins.txt",
 
 //================= Kafras & Cool Event Corp. =============================
-npc: npc/pre-re/kafras/kafras.txt
+"npc/pre-re/kafras/kafras.txt",
 
 //================= Merchants =============================================
-npc: npc/pre-re/merchants/ammo_boxes.txt
-npc: npc/pre-re/merchants/ammo_dealer.txt
-npc: npc/pre-re/merchants/shops.txt
+"npc/pre-re/merchants/ammo_boxes.txt",
+"npc/pre-re/merchants/ammo_dealer.txt",
+"npc/pre-re/merchants/shops.txt",
 
 //================= Others ================================================
-npc: npc/pre-re/other/bulletin_boards.txt
-npc: npc/pre-re/other/mercenary_rent.txt
-npc: npc/pre-re/other/pvp.txt
-npc: npc/pre-re/other/msg_boards.txt
-npc: npc/pre-re/other/resetskill.txt
-npc: npc/pre-re/other/turbo_track.txt
+"npc/pre-re/other/bulletin_boards.txt",
+"npc/pre-re/other/mercenary_rent.txt",
+"npc/pre-re/other/pvp.txt",
+"npc/pre-re/other/msg_boards.txt",
+"npc/pre-re/other/resetskill.txt",
+"npc/pre-re/other/turbo_track.txt",
 
 //================= Quests ================================================
 // - Repeatable EXP Quests (iRO) --------------------------------
-//npc: npc/pre-re/quests/collection/quest_alligator.txt
-//npc: npc/pre-re/quests/collection/quest_caramel.txt
+//"npc/pre-re/quests/collection/quest_alligator.txt",
+//"npc/pre-re/quests/collection/quest_caramel.txt",
 // - Exploitable due to vendor selling Acorns in Moscovia
-//npc: npc/pre-re/quests/collection/quest_coco.txt
-//npc: npc/pre-re/quests/collection/quest_creamy.txt
-//npc: npc/pre-re/quests/collection/quest_demonpungus.txt
-//npc: npc/pre-re/quests/collection/quest_disguiseloliruri.txt
-//npc: npc/pre-re/quests/collection/quest_dokebi.txt
-//npc: npc/pre-re/quests/collection/quest_dryad.txt
-//npc: npc/pre-re/quests/collection/quest_fabre.txt
-//npc: npc/pre-re/quests/collection/quest_frilldora.txt
+//"npc/pre-re/quests/collection/quest_coco.txt",
+//"npc/pre-re/quests/collection/quest_creamy.txt",
+//"npc/pre-re/quests/collection/quest_demonpungus.txt",
+//"npc/pre-re/quests/collection/quest_disguiseloliruri.txt",
+//"npc/pre-re/quests/collection/quest_dokebi.txt",
+//"npc/pre-re/quests/collection/quest_dryad.txt",
+//"npc/pre-re/quests/collection/quest_fabre.txt",
+//"npc/pre-re/quests/collection/quest_frilldora.txt",
 // - Exploitable due to vendor selling Antelope Horns in Niflheim
-//npc: npc/pre-re/quests/collection/quest_goat.txt
-//npc: npc/pre-re/quests/collection/quest_golem.txt
-//npc: npc/pre-re/quests/collection/quest_hode.txt
-//npc: npc/pre-re/quests/collection/quest_leafcat.txt
-//npc: npc/pre-re/quests/collection/quest_mantis.txt
+//"npc/pre-re/quests/collection/quest_goat.txt",
+//"npc/pre-re/quests/collection/quest_golem.txt",
+//"npc/pre-re/quests/collection/quest_hode.txt",
+//"npc/pre-re/quests/collection/quest_leafcat.txt",
+//"npc/pre-re/quests/collection/quest_mantis.txt",
 // - Exploitable due to vendor selling Bill of Birds in Morroc
-//npc: npc/pre-re/quests/collection/quest_pecopeco.txt
-//npc: npc/pre-re/quests/collection/quest_pupa.txt
-//npc: npc/pre-re/quests/collection/quest_zhupolong.txt
+//"npc/pre-re/quests/collection/quest_pecopeco.txt",
+//"npc/pre-re/quests/collection/quest_pupa.txt",
+//"npc/pre-re/quests/collection/quest_zhupolong.txt",
 // --------------------------------------------------------------
 // - Quests-Tutorials for basic classes (1st class quests) ------
-npc: npc/pre-re/quests/first_class/tu_archer.txt
+"npc/pre-re/quests/first_class/tu_archer.txt",
 // --------------------------------------------------------------
-npc: npc/pre-re/quests/monstertamers.txt
-npc: npc/pre-re/quests/mrsmile.txt
-npc: npc/pre-re/quests/quests_13_1.txt
-npc: npc/pre-re/quests/quests_izlude.txt
-npc: npc/pre-re/quests/quests_lighthalzen.txt
-npc: npc/pre-re/quests/quests_nameless.txt
-npc: npc/pre-re/quests/quests_veins.txt
+"npc/pre-re/quests/monstertamers.txt",
+"npc/pre-re/quests/mrsmile.txt",
+"npc/pre-re/quests/quests_13_1.txt",
+"npc/pre-re/quests/quests_izlude.txt",
+"npc/pre-re/quests/quests_lighthalzen.txt",
+"npc/pre-re/quests/quests_nameless.txt",
+"npc/pre-re/quests/quests_veins.txt",
diff --git a/npc/pre-re/scripts_jobs.conf b/npc/pre-re/scripts_jobs.conf
index bf0f46c28..139f9de48 100644
--- a/npc/pre-re/scripts_jobs.conf
+++ b/npc/pre-re/scripts_jobs.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -30,15 +30,15 @@
 
 //================= Job Quests ============================================
 // - 1-1
-npc: npc/pre-re/jobs/1-1/acolyte.txt
-npc: npc/pre-re/jobs/1-1/archer.txt
-npc: npc/pre-re/jobs/1-1/mage.txt
-npc: npc/pre-re/jobs/1-1/merchant.txt
-npc: npc/pre-re/jobs/1-1/swordman.txt
-npc: npc/pre-re/jobs/1-1/thief.txt
+"npc/pre-re/jobs/1-1/acolyte.txt",
+"npc/pre-re/jobs/1-1/archer.txt",
+"npc/pre-re/jobs/1-1/mage.txt",
+"npc/pre-re/jobs/1-1/merchant.txt",
+"npc/pre-re/jobs/1-1/swordman.txt",
+"npc/pre-re/jobs/1-1/thief.txt",
 // - Novice
-npc: npc/pre-re/jobs/novice/novice.txt
+"npc/pre-re/jobs/novice/novice.txt",
 
 //================= Skill Quests ==========================================
 // - Novice
-npc: npc/pre-re/quests/skills/novice_skills.txt
+"npc/pre-re/quests/skills/novice_skills.txt",
diff --git a/npc/pre-re/scripts_main.conf b/npc/pre-re/scripts_main.conf
index 356aa7c12..9381497ec 100644
--- a/npc/pre-re/scripts_main.conf
+++ b/npc/pre-re/scripts_main.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -27,46 +27,49 @@
 //=========================================================================
 //= Hercules Pre-Renewal Primary Scripts File
 //=========================================================================
-//  The idea of this new system is to make scripts more organized
-// since the old system was rather messy with all the NPCs in one
-// file. Now scripts are organized in to files arraged by type.
-//  Custom scripts are now in scripts_custom.conf, all other
-// scripts are deemed as 'official'. You should place your NPCs
-// in to scripts_custom.conf to follow the trend.
-//
-// Thanks,
-//  Ancyker and the rest of the Hercules Team
-//
-// Note: "Comments" are all text on the right side of a double slash "//"
-// Whatever text is commented will not be parsed by the servers, and serves
-// only as information/reference.
+// The idea of this new system is to make scripts more organized since the old
+// system was rather messy with all the NPCs in one file. Now scripts are
+// organized in to files arraged by type.  Custom scripts are now in
+// scripts_custom.conf, all other scripts are deemed as 'official'. You should
+// place your NPCs in to scripts_custom.conf to follow the trend.
 //=========================================================================
 
-//================= Global Scripts Functions ==============================
+//================= Disabled Scripts ======================================
+// All NPCs that you wish to remove from your loading list should be put in
+// this file
+@include "npc/scripts_removed.conf"
+
+//================= Global NPC list =======================================
+// Only files that are included here will be read by the server
+npc_global_list: (
+
+//- Global Scripts Functions -
 // Utilitarian functions used by many scripts.
-npc: npc/other/Global_Functions.txt
+"npc/other/Global_Functions.txt",
 
-//================= Cash Shop Functions ===================================
+//- Cash Shop Functions -
 // Used by cash shop items in the Item Database.
-npc: npc/other/CashShop_Functions.txt
+"npc/other/CashShop_Functions.txt",
+
+//- Common Script Files -
+@include "npc/scripts.conf"
+@include "npc/scripts_woe.conf"
+@include "npc/scripts_jobs.conf"
+@include "npc/scripts_mapflags.conf"
+@include "npc/scripts_monsters.conf"
+@include "npc/scripts_warps.conf"
 
-//================= Common Script Files ===================================
-import: npc/scripts.conf
-import: npc/scripts_woe.conf
-import: npc/scripts_jobs.conf
-import: npc/scripts_mapflags.conf
-import: npc/scripts_monsters.conf
-import: npc/scripts_warps.conf
+//- Pre-Renewal Script Files -
+@include "npc/pre-re/scripts.conf"
+@include "npc/pre-re/scripts_jobs.conf"
+@include "npc/pre-re/scripts_monsters.conf"
+@include "npc/pre-re/scripts_warps.conf"
 
-//================= Pre-Renewal Script Files ==============================
-import: npc/pre-re/scripts.conf
-import: npc/pre-re/scripts_jobs.conf
-import: npc/pre-re/scripts_monsters.conf
-import: npc/pre-re/scripts_warps.conf
+//- Development / Testing Script Files -
+@include "npc/scripts_dev.conf"
 
-//================= Development / Testing Script Files ====================
-import: npc/scripts_dev.conf
+//- Custom Script Files -
+// Your NPCs go in this file!
+@include "npc/scripts_custom.conf"
 
-//================= Custom Script Files ===================================
-// - Your NPCs go in this file!
-import: npc/scripts_custom.conf
+) // npc_global_list
diff --git a/npc/pre-re/scripts_monsters.conf b/npc/pre-re/scripts_monsters.conf
index 8d726e8bc..83ec3cc64 100644
--- a/npc/pre-re/scripts_monsters.conf
+++ b/npc/pre-re/scripts_monsters.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -29,70 +29,70 @@
 //=========================================================================
 
 //================= Misc Spawns ===========================================
-npc: npc/pre-re/mobs/citycleaners.txt
+"npc/pre-re/mobs/citycleaners.txt",
 
 //================= Dungeons ==============================================
-npc: npc/pre-re/mobs/dungeons/abbey.txt
-npc: npc/pre-re/mobs/dungeons/abyss.txt
-npc: npc/pre-re/mobs/dungeons/alde_dun.txt
-npc: npc/pre-re/mobs/dungeons/ama_dun.txt
-npc: npc/pre-re/mobs/dungeons/anthell.txt
-npc: npc/pre-re/mobs/dungeons/ayo_dun.txt
-npc: npc/pre-re/mobs/dungeons/beach_dun.txt
-npc: npc/pre-re/mobs/dungeons/c_tower.txt
-npc: npc/pre-re/mobs/dungeons/ein_dun.txt
-npc: npc/pre-re/mobs/dungeons/gef_dun.txt
-npc: npc/pre-re/mobs/dungeons/gefenia.txt
-npc: npc/pre-re/mobs/dungeons/glastheim.txt
-npc: npc/pre-re/mobs/dungeons/gld_dun.txt
-npc: npc/pre-re/mobs/dungeons/gld_dunSE.txt
-npc: npc/pre-re/mobs/dungeons/gon_dun.txt
-npc: npc/pre-re/mobs/dungeons/ice_dun.txt
-npc: npc/pre-re/mobs/dungeons/in_sphinx.txt
-npc: npc/pre-re/mobs/dungeons/iz_dun.txt
-npc: npc/pre-re/mobs/dungeons/juperos.txt
-npc: npc/pre-re/mobs/dungeons/kh_dun.txt
-npc: npc/pre-re/mobs/dungeons/lhz_dun.txt
-npc: npc/pre-re/mobs/dungeons/lou_dun.txt
-npc: npc/pre-re/mobs/dungeons/mag_dun.txt
-npc: npc/pre-re/mobs/dungeons/mjo_dun.txt
-npc: npc/pre-re/mobs/dungeons/moc_pryd.txt
-npc: npc/pre-re/mobs/dungeons/mosk_dun.txt
-npc: npc/pre-re/mobs/dungeons/nyd_dun.txt
-npc: npc/pre-re/mobs/dungeons/odin.txt
-npc: npc/pre-re/mobs/dungeons/orcsdun.txt
-npc: npc/pre-re/mobs/dungeons/pay_dun.txt
-npc: npc/pre-re/mobs/dungeons/prt_maze.txt
-npc: npc/pre-re/mobs/dungeons/prt_sew.txt
-npc: npc/pre-re/mobs/dungeons/ra_san.txt
-npc: npc/pre-re/mobs/dungeons/tha_t.txt
-npc: npc/pre-re/mobs/dungeons/thor_v.txt
-npc: npc/pre-re/mobs/dungeons/treasure.txt
-npc: npc/pre-re/mobs/dungeons/tur_dun.txt
-npc: npc/pre-re/mobs/dungeons/um_dun.txt
-npc: npc/pre-re/mobs/dungeons/xmas_dun.txt
-npc: npc/pre-re/mobs/dungeons/yggdrasil.txt
+"npc/pre-re/mobs/dungeons/abbey.txt",
+"npc/pre-re/mobs/dungeons/abyss.txt",
+"npc/pre-re/mobs/dungeons/alde_dun.txt",
+"npc/pre-re/mobs/dungeons/ama_dun.txt",
+"npc/pre-re/mobs/dungeons/anthell.txt",
+"npc/pre-re/mobs/dungeons/ayo_dun.txt",
+"npc/pre-re/mobs/dungeons/beach_dun.txt",
+"npc/pre-re/mobs/dungeons/c_tower.txt",
+"npc/pre-re/mobs/dungeons/ein_dun.txt",
+"npc/pre-re/mobs/dungeons/gef_dun.txt",
+"npc/pre-re/mobs/dungeons/gefenia.txt",
+"npc/pre-re/mobs/dungeons/glastheim.txt",
+"npc/pre-re/mobs/dungeons/gld_dun.txt",
+"npc/pre-re/mobs/dungeons/gld_dunSE.txt",
+"npc/pre-re/mobs/dungeons/gon_dun.txt",
+"npc/pre-re/mobs/dungeons/ice_dun.txt",
+"npc/pre-re/mobs/dungeons/in_sphinx.txt",
+"npc/pre-re/mobs/dungeons/iz_dun.txt",
+"npc/pre-re/mobs/dungeons/juperos.txt",
+"npc/pre-re/mobs/dungeons/kh_dun.txt",
+"npc/pre-re/mobs/dungeons/lhz_dun.txt",
+"npc/pre-re/mobs/dungeons/lou_dun.txt",
+"npc/pre-re/mobs/dungeons/mag_dun.txt",
+"npc/pre-re/mobs/dungeons/mjo_dun.txt",
+"npc/pre-re/mobs/dungeons/moc_pryd.txt",
+"npc/pre-re/mobs/dungeons/mosk_dun.txt",
+"npc/pre-re/mobs/dungeons/nyd_dun.txt",
+"npc/pre-re/mobs/dungeons/odin.txt",
+"npc/pre-re/mobs/dungeons/orcsdun.txt",
+"npc/pre-re/mobs/dungeons/pay_dun.txt",
+"npc/pre-re/mobs/dungeons/prt_maze.txt",
+"npc/pre-re/mobs/dungeons/prt_sew.txt",
+"npc/pre-re/mobs/dungeons/ra_san.txt",
+"npc/pre-re/mobs/dungeons/tha_t.txt",
+"npc/pre-re/mobs/dungeons/thor_v.txt",
+"npc/pre-re/mobs/dungeons/treasure.txt",
+"npc/pre-re/mobs/dungeons/tur_dun.txt",
+"npc/pre-re/mobs/dungeons/um_dun.txt",
+"npc/pre-re/mobs/dungeons/xmas_dun.txt",
+"npc/pre-re/mobs/dungeons/yggdrasil.txt",
 
 //================= Fields ================================================
-npc: npc/pre-re/mobs/fields/amatsu.txt
-npc: npc/pre-re/mobs/fields/ayothaya.txt
-npc: npc/pre-re/mobs/fields/comodo.txt
-npc: npc/pre-re/mobs/fields/einbroch.txt
-npc: npc/pre-re/mobs/fields/geffen.txt
-npc: npc/pre-re/mobs/fields/gonryun.txt
-npc: npc/pre-re/mobs/fields/hugel.txt
-npc: npc/pre-re/mobs/fields/lighthalzen.txt
-npc: npc/pre-re/mobs/fields/louyang.txt
-npc: npc/pre-re/mobs/fields/lutie.txt
-npc: npc/pre-re/mobs/fields/manuk.txt
-npc: npc/pre-re/mobs/fields/mjolnir.txt
-npc: npc/pre-re/mobs/fields/morocc.txt
-npc: npc/pre-re/mobs/fields/moscovia.txt
-npc: npc/pre-re/mobs/fields/niflheim.txt
-npc: npc/pre-re/mobs/fields/payon.txt
-npc: npc/pre-re/mobs/fields/prontera.txt
-npc: npc/pre-re/mobs/fields/rachel.txt
-npc: npc/pre-re/mobs/fields/splendide.txt
-npc: npc/pre-re/mobs/fields/umbala.txt
-npc: npc/pre-re/mobs/fields/veins.txt
-npc: npc/pre-re/mobs/fields/yuno.txt
+"npc/pre-re/mobs/fields/amatsu.txt",
+"npc/pre-re/mobs/fields/ayothaya.txt",
+"npc/pre-re/mobs/fields/comodo.txt",
+"npc/pre-re/mobs/fields/einbroch.txt",
+"npc/pre-re/mobs/fields/geffen.txt",
+"npc/pre-re/mobs/fields/gonryun.txt",
+"npc/pre-re/mobs/fields/hugel.txt",
+"npc/pre-re/mobs/fields/lighthalzen.txt",
+"npc/pre-re/mobs/fields/louyang.txt",
+"npc/pre-re/mobs/fields/lutie.txt",
+"npc/pre-re/mobs/fields/manuk.txt",
+"npc/pre-re/mobs/fields/mjolnir.txt",
+"npc/pre-re/mobs/fields/morocc.txt",
+"npc/pre-re/mobs/fields/moscovia.txt",
+"npc/pre-re/mobs/fields/niflheim.txt",
+"npc/pre-re/mobs/fields/payon.txt",
+"npc/pre-re/mobs/fields/prontera.txt",
+"npc/pre-re/mobs/fields/rachel.txt",
+"npc/pre-re/mobs/fields/splendide.txt",
+"npc/pre-re/mobs/fields/umbala.txt",
+"npc/pre-re/mobs/fields/veins.txt",
+"npc/pre-re/mobs/fields/yuno.txt",
diff --git a/npc/pre-re/scripts_warps.conf b/npc/pre-re/scripts_warps.conf
index 472a0e6da..2e4c65027 100644
--- a/npc/pre-re/scripts_warps.conf
+++ b/npc/pre-re/scripts_warps.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -29,21 +29,21 @@
 //=========================================================================
 
 //================= Cities ================================================
-npc: npc/pre-re/warps/cities/izlude.txt
-npc: npc/pre-re/warps/cities/rachel.txt
-npc: npc/pre-re/warps/cities/yggdrasil.txt
+"npc/pre-re/warps/cities/izlude.txt",
+"npc/pre-re/warps/cities/rachel.txt",
+"npc/pre-re/warps/cities/yggdrasil.txt",
 
 //================= Fields ================================================
-npc: npc/pre-re/warps/fields/com_fild.txt
-npc: npc/pre-re/warps/fields/geffen_fild.txt
-npc: npc/pre-re/warps/fields/hugel_fild.txt
-npc: npc/pre-re/warps/fields/morroc_fild.txt
-npc: npc/pre-re/warps/fields/payon_fild.txt
-npc: npc/pre-re/warps/fields/prontera_fild.txt
-npc: npc/pre-re/warps/fields/rachel_fild.txt
-npc: npc/pre-re/warps/fields/veins_fild.txt
-npc: npc/pre-re/warps/fields/yuno_fild.txt
+"npc/pre-re/warps/fields/com_fild.txt",
+"npc/pre-re/warps/fields/geffen_fild.txt",
+"npc/pre-re/warps/fields/hugel_fild.txt",
+"npc/pre-re/warps/fields/morroc_fild.txt",
+"npc/pre-re/warps/fields/payon_fild.txt",
+"npc/pre-re/warps/fields/prontera_fild.txt",
+"npc/pre-re/warps/fields/rachel_fild.txt",
+"npc/pre-re/warps/fields/veins_fild.txt",
+"npc/pre-re/warps/fields/yuno_fild.txt",
 
 //================= Others ================================================
-npc: npc/pre-re/warps/other/arena.txt
-npc: npc/pre-re/warps/other/sign.txt
+"npc/pre-re/warps/other/arena.txt",
+"npc/pre-re/warps/other/sign.txt",
diff --git a/npc/re/scripts.conf b/npc/re/scripts.conf
index 53c5f4944..38caffc81 100644
--- a/npc/re/scripts.conf
+++ b/npc/re/scripts.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -29,152 +29,152 @@
 //=========================================================================
 
 //================= Airport ===============================================
-npc: npc/re/airports/izlude.txt
+"npc/re/airports/izlude.txt",
 
 //================ Battlegrounds ==========================================
-npc: npc/re/battleground/bg_common.txt
+"npc/re/battleground/bg_common.txt",
 
 //================= Cities ================================================
-npc: npc/re/cities/alberta.txt
-npc: npc/re/cities/brasilis.txt
-npc: npc/re/cities/dewata.txt
-npc: npc/re/cities/dicastes.txt
-npc: npc/re/cities/eclage.txt
-npc: npc/re/cities/izlude.txt
-npc: npc/re/cities/jawaii.txt
-npc: npc/re/cities/malangdo.txt
-npc: npc/re/cities/malaya.txt
-npc: npc/re/cities/mora.txt
-npc: npc/re/cities/yuno.txt
+"npc/re/cities/alberta.txt",
+"npc/re/cities/brasilis.txt",
+"npc/re/cities/dewata.txt",
+"npc/re/cities/dicastes.txt",
+"npc/re/cities/eclage.txt",
+"npc/re/cities/izlude.txt",
+"npc/re/cities/jawaii.txt",
+"npc/re/cities/malangdo.txt",
+"npc/re/cities/malaya.txt",
+"npc/re/cities/mora.txt",
+"npc/re/cities/yuno.txt",
 
 //================= Events ================================================
-//npc: npc/re/events/halloween_2013.txt
-//npc: npc/re/events/halloween_2014.txt
-//npc: npc/re/events/christmas_2013.txt
+//"npc/re/events/halloween_2013.txt",
+//"npc/re/events/halloween_2014.txt",
+//"npc/re/events/christmas_2013.txt",
 
 //================= Guides ================================================
-npc: npc/re/guides/navigation.txt
-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_dewata.txt
-npc: npc/re/guides/guides_dicastes.txt
-npc: npc/re/guides/guides_eclage.txt
-npc: npc/re/guides/guides_einbroch.txt
-npc: npc/re/guides/guides_geffen.txt
-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_lighthalzen.txt
-npc: npc/re/guides/guides_louyang.txt
-npc: npc/re/guides/guides_lutie.txt
-npc: npc/re/guides/guides_malaya.txt
-npc: npc/re/guides/guides_mora.txt
-npc: npc/re/guides/guides_morroc.txt
-npc: npc/re/guides/guides_moscovia.txt
-npc: npc/re/guides/guides_niflheim.txt
-npc: npc/re/guides/guides_payon.txt
-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
+"npc/re/guides/navigation.txt",
+"npc/re/guides/guides_alberta.txt",
+"npc/re/guides/guides_aldebaran.txt",
+"npc/re/guides/guides_amatsu.txt",
+"npc/re/guides/guides_ayothaya.txt",
+"npc/re/guides/guides_brasilis.txt",
+"npc/re/guides/guides_comodo.txt",
+"npc/re/guides/guides_dewata.txt",
+"npc/re/guides/guides_dicastes.txt",
+"npc/re/guides/guides_eclage.txt",
+"npc/re/guides/guides_einbroch.txt",
+"npc/re/guides/guides_geffen.txt",
+"npc/re/guides/guides_gonryun.txt",
+"npc/re/guides/guides_hugel.txt",
+"npc/re/guides/guides_izlude.txt",
+"npc/re/guides/guides_juno.txt",
+"npc/re/guides/guides_lighthalzen.txt",
+"npc/re/guides/guides_louyang.txt",
+"npc/re/guides/guides_lutie.txt",
+"npc/re/guides/guides_malaya.txt",
+"npc/re/guides/guides_mora.txt",
+"npc/re/guides/guides_morroc.txt",
+"npc/re/guides/guides_moscovia.txt",
+"npc/re/guides/guides_niflheim.txt",
+"npc/re/guides/guides_payon.txt",
+"npc/re/guides/guides_prontera.txt",
+"npc/re/guides/guides_rachel.txt",
+"npc/re/guides/guides_umbala.txt",
+"npc/re/guides/guides_veins.txt",
 
 //================= Instances =============================================
-npc: npc/re/instances/BakonawaLake.txt
-npc: npc/re/instances/BangungotHospital.txt
-npc: npc/re/instances/BuwayaCave.txt
-npc: npc/re/instances/HazyForest.txt
-npc: npc/re/instances/MalangdoCulvert.txt
-npc: npc/re/instances/OctopusCave.txt
-npc: npc/re/instances/OldGlastHeim.txt
-npc: npc/re/instances/saras_memory.txt
-npc: npc/re/instances/WolfchevLaboratory.txt
-npc: npc/re/instances/EclageInterior.txt
+"npc/re/instances/BakonawaLake.txt",
+"npc/re/instances/BangungotHospital.txt",
+"npc/re/instances/BuwayaCave.txt",
+"npc/re/instances/HazyForest.txt",
+"npc/re/instances/MalangdoCulvert.txt",
+"npc/re/instances/OctopusCave.txt",
+"npc/re/instances/OldGlastHeim.txt",
+"npc/re/instances/saras_memory.txt",
+"npc/re/instances/WolfchevLaboratory.txt",
+"npc/re/instances/EclageInterior.txt",
 
 //================= Kafras & Cool Event Corp. =============================
-npc: npc/re/kafras/kafras.txt
+"npc/re/kafras/kafras.txt",
 
 //================= Merchants =============================================
-npc: npc/re/merchants/3rd_trader.txt
-npc: npc/re/merchants/advanced_refiner.txt
-npc: npc/re/merchants/alchemist.txt
-npc: npc/re/merchants/ammo_boxes.txt
-npc: npc/re/merchants/ammo_dealer.txt
-//npc: npc/re/merchants/blessed_refiner.txt
-npc: npc/re/merchants/card_separation.txt
-npc: npc/re/merchants/catalog.txt
-npc: npc/re/merchants/coin_exchange.txt
-npc: npc/re/merchants/diamond.txt
-npc: npc/re/merchants/enchan_mal.txt
-npc: npc/re/merchants/enchan_mora.txt
-npc: npc/re/merchants/enchan_ko.txt
-npc: npc/re/merchants/flute.txt
-npc: npc/re/merchants/hd_refiner.txt
-npc: npc/re/merchants/inn.txt
-npc: npc/re/merchants/quivers.txt
-npc: npc/re/merchants/refine.txt
-npc: npc/re/merchants/renters.txt
-npc: npc/re/merchants/shops.txt
-//npc: npc/re/merchants/ticket_refiner.txt
-//npc: npc/re/merchants/enchan_upg.txt
-npc: npc/re/merchants/ninja_craftsman.txt
-npc: npc/re/merchants/shadow_refiner.txt
+"npc/re/merchants/3rd_trader.txt",
+"npc/re/merchants/advanced_refiner.txt",
+"npc/re/merchants/alchemist.txt",
+"npc/re/merchants/ammo_boxes.txt",
+"npc/re/merchants/ammo_dealer.txt",
+//"npc/re/merchants/blessed_refiner.txt",
+"npc/re/merchants/card_separation.txt",
+"npc/re/merchants/catalog.txt",
+"npc/re/merchants/coin_exchange.txt",
+"npc/re/merchants/diamond.txt",
+"npc/re/merchants/enchan_mal.txt",
+"npc/re/merchants/enchan_mora.txt",
+"npc/re/merchants/enchan_ko.txt",
+"npc/re/merchants/flute.txt",
+"npc/re/merchants/hd_refiner.txt",
+"npc/re/merchants/inn.txt",
+"npc/re/merchants/quivers.txt",
+"npc/re/merchants/refine.txt",
+"npc/re/merchants/renters.txt",
+"npc/re/merchants/shops.txt",
+//"npc/re/merchants/ticket_refiner.txt",
+//"npc/re/merchants/enchan_upg.txt",
+"npc/re/merchants/ninja_craftsman.txt",
+"npc/re/merchants/shadow_refiner.txt",
 
 //================= Others ================================================
-npc: npc/re/other/bulletin_boards.txt
-npc: npc/re/other/mail.txt
-npc: npc/re/other/mercenary_rent.txt
-npc: npc/re/other/pvp.txt
-npc: npc/re/other/resetskill.txt
-npc: npc/re/other/stone_change.txt
-npc: npc/re/other/turbo_track.txt
+"npc/re/other/bulletin_boards.txt",
+"npc/re/other/mail.txt",
+"npc/re/other/mercenary_rent.txt",
+"npc/re/other/pvp.txt",
+"npc/re/other/resetskill.txt",
+"npc/re/other/stone_change.txt",
+"npc/re/other/turbo_track.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/100-110.txt
-npc: npc/re/quests/eden/111-120.txt
-npc: npc/re/quests/eden/121-130.txt
-npc: npc/re/quests/eden/131-140.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
-npc: npc/re/quests/eden/eden_tutorial.txt
+"npc/re/quests/eden/11-25.txt",
+"npc/re/quests/eden/26-40.txt",
+"npc/re/quests/eden/41-55.txt",
+"npc/re/quests/eden/56-70.txt",
+"npc/re/quests/eden/71-85.txt",
+"npc/re/quests/eden/86-90.txt",
+"npc/re/quests/eden/91-99.txt",
+"npc/re/quests/eden/100-110.txt",
+"npc/re/quests/eden/111-120.txt",
+"npc/re/quests/eden/121-130.txt",
+"npc/re/quests/eden/131-140.txt",
+"npc/re/quests/eden/eden_common.txt",
+"npc/re/quests/eden/eden_quests.txt",
+"npc/re/quests/eden/eden_service.txt",
+"npc/re/quests/eden/eden_tutorial.txt",
 // iRO custom additions.
-//npc: npc/re/quests/eden/eden_iro.txt
+//"npc/re/quests/eden/eden_iro.txt",
 // --------------------------------------------------------------
 // - Quests-Tutorials for basic classes (1st class quests) ------
-npc: npc/re/quests/first_class/tu_archer.txt
+"npc/re/quests/first_class/tu_archer.txt",
 // --------------------------------------------------------------
-//npc: npc/re/quests/cupet.txt
-npc: npc/re/quests/homun_s.txt
-npc: npc/re/quests/magic_books.txt
-npc: npc/re/quests/monstertamers.txt
-npc: npc/re/quests/mrsmile.txt
-npc: npc/re/quests/pile_bunker.txt
-npc: npc/re/quests/quests_13_1.txt
-npc: npc/re/quests/quests_aldebaran.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_eclage.txt
-npc: npc/re/quests/quests_izlude.txt
-npc: npc/re/quests/quests_lighthalzen.txt
-npc: npc/re/quests/quests_malangdo.txt
-npc: npc/re/quests/quests_malaya.txt
-npc: npc/re/quests/quests_mora.txt
-npc: npc/re/quests/quests_morocc.txt
-npc: npc/re/quests/quests_nameless.txt
-npc: npc/re/quests/quests_veins.txt
+//"npc/re/quests/cupet.txt",
+"npc/re/quests/homun_s.txt",
+"npc/re/quests/magic_books.txt",
+"npc/re/quests/monstertamers.txt",
+"npc/re/quests/mrsmile.txt",
+"npc/re/quests/pile_bunker.txt",
+"npc/re/quests/quests_13_1.txt",
+"npc/re/quests/quests_aldebaran.txt",
+"npc/re/quests/quests_brasilis.txt",
+"npc/re/quests/quests_dewata.txt",
+"npc/re/quests/quests_dicastes.txt",
+"npc/re/quests/quests_eclage.txt",
+"npc/re/quests/quests_izlude.txt",
+"npc/re/quests/quests_lighthalzen.txt",
+"npc/re/quests/quests_malangdo.txt",
+"npc/re/quests/quests_malaya.txt",
+"npc/re/quests/quests_mora.txt",
+"npc/re/quests/quests_morocc.txt",
+"npc/re/quests/quests_nameless.txt",
+"npc/re/quests/quests_veins.txt",
 // - New Gears --------------------------------------------------
-npc: npc/re/quests/newgears/2012_headgears.txt
+"npc/re/quests/newgears/2012_headgears.txt",
diff --git a/npc/re/scripts_jobs.conf b/npc/re/scripts_jobs.conf
index 7a2db4447..08218a912 100644
--- a/npc/re/scripts_jobs.conf
+++ b/npc/re/scripts_jobs.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -30,32 +30,32 @@
 
 //================= Job Quests ============================================
 // - 1-1
-npc: npc/re/jobs/1-1/acolyte.txt
-npc: npc/re/jobs/1-1/archer.txt
-npc: npc/re/jobs/1-1/mage.txt
-npc: npc/re/jobs/1-1/merchant.txt
-npc: npc/re/jobs/1-1/swordman.txt
-npc: npc/re/jobs/1-1/thief.txt
+"npc/re/jobs/1-1/acolyte.txt",
+"npc/re/jobs/1-1/archer.txt",
+"npc/re/jobs/1-1/mage.txt",
+"npc/re/jobs/1-1/merchant.txt",
+"npc/re/jobs/1-1/swordman.txt",
+"npc/re/jobs/1-1/thief.txt",
 // - 2e
-npc: npc/re/jobs/2e/kagerou_oboro.txt
+"npc/re/jobs/2e/kagerou_oboro.txt",
 // - 3-1
-npc: npc/re/jobs/3-1/archbishop.txt
-npc: npc/re/jobs/3-1/mechanic.txt
-npc: npc/re/jobs/3-1/ranger.txt
-npc: npc/re/jobs/3-1/rune_knight.txt
-npc: npc/re/jobs/3-1/warlock.txt
-npc: npc/re/jobs/3-1/guillotine_cross.txt
+"npc/re/jobs/3-1/archbishop.txt",
+"npc/re/jobs/3-1/mechanic.txt",
+"npc/re/jobs/3-1/ranger.txt",
+"npc/re/jobs/3-1/rune_knight.txt",
+"npc/re/jobs/3-1/warlock.txt",
+"npc/re/jobs/3-1/guillotine_cross.txt",
 // - 3-2
-npc: npc/re/jobs/3-2/genetic.txt
-npc: npc/re/jobs/3-2/minstrel.txt
-npc: npc/re/jobs/3-2/royal_guard.txt
-npc: npc/re/jobs/3-2/shadow_chaser.txt
-npc: npc/re/jobs/3-2/sorcerer.txt
-npc: npc/re/jobs/3-2/sura.txt
-npc: npc/re/jobs/3-2/wanderer.txt
+"npc/re/jobs/3-2/genetic.txt",
+"npc/re/jobs/3-2/minstrel.txt",
+"npc/re/jobs/3-2/royal_guard.txt",
+"npc/re/jobs/3-2/shadow_chaser.txt",
+"npc/re/jobs/3-2/sorcerer.txt",
+"npc/re/jobs/3-2/sura.txt",
+"npc/re/jobs/3-2/wanderer.txt",
 // - Novice
-npc: npc/re/jobs/novice/academy.txt
-// npc: npc/re/jobs/novice/novice.txt
-npc: npc/re/jobs/novice/supernovice_ex.txt
+"npc/re/jobs/novice/academy.txt",
+//"npc/re/jobs/novice/novice.txt",
+"npc/re/jobs/novice/supernovice_ex.txt",
 // - Job Repairs
-npc: npc/re/jobs/repair.txt
+"npc/re/jobs/repair.txt",
diff --git a/npc/re/scripts_main.conf b/npc/re/scripts_main.conf
index fd0d85fad..475e8d1be 100644
--- a/npc/re/scripts_main.conf
+++ b/npc/re/scripts_main.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -27,48 +27,51 @@
 //=========================================================================
 //= Hercules Renewal Primary Scripts File
 //=========================================================================
-// The idea of this new system is to make scripts more organized
-// since the old system was rather messy with all the NPCs in one
-// file. Now scripts are organized in to files arraged by type.
-// Custom scripts are now in scripts_custom.conf, all other
-// scripts are deemed as 'official'. You should place your NPCs
-// in to scripts_custom.conf to follow the trend.
-//
-// Thanks,
-//  Ancyker and the rest of the Hercules Team
-//
-// Note: "Comments" are all text on the right side of a double slash "//"
-// Whatever text is commented will not be parsed by the servers, and serves
-// only as information/reference.
+// The idea of this new system is to make scripts more organized since the old
+// system was rather messy with all the NPCs in one file. Now scripts are
+// organized in to files arraged by type.  Custom scripts are now in
+// scripts_custom.conf, all other scripts are deemed as 'official'. You should
+// place your NPCs in to scripts_custom.conf to follow the trend.
 //=========================================================================
 
-//================= Global Scripts Functions ==============================
+//================= Disabled Scripts ======================================
+// All NPCs that you wish to remove from your loading list should be put in
+// this file
+@include "npc/scripts_removed.conf"
+
+//================= Global NPC list =======================================
+// Only files that are included here will be read by the server
+npc_global_list: (
+
+//- Global Scripts Functions -
 // Utilitarian functions used by many scripts.
-npc: npc/other/Global_Functions.txt
+"npc/other/Global_Functions.txt",
 
-//================= Cash Shop Functions ===================================
+//- Cash Shop Functions -
 // Used by cash shop items in the Item Database.
-npc: npc/other/CashShop_Functions.txt
+"npc/other/CashShop_Functions.txt",
+
+//- Common Script Files -
+@include "npc/scripts.conf"
+@include "npc/scripts_woe.conf"
+@include "npc/scripts_jobs.conf"
+@include "npc/scripts_mapflags.conf"
+@include "npc/scripts_monsters.conf"
+@include "npc/scripts_warps.conf"
 
-//================= Common Script Files ===================================
-import: npc/scripts.conf
-import: npc/scripts_woe.conf
-import: npc/scripts_jobs.conf
-import: npc/scripts_mapflags.conf
-import: npc/scripts_monsters.conf
-import: npc/scripts_warps.conf
+//- Renewal Script Files -
+@include "npc/re/scripts.conf"
+@include "npc/re/scripts_woe.conf"
+@include "npc/re/scripts_jobs.conf"
+@include "npc/re/scripts_mapflags.conf"
+@include "npc/re/scripts_monsters.conf"
+@include "npc/re/scripts_warps.conf"
 
-//================= Renewal Script Files ==================================
-import: npc/re/scripts.conf
-import: npc/re/scripts_woe.conf
-import: npc/re/scripts_jobs.conf
-import: npc/re/scripts_mapflags.conf
-import: npc/re/scripts_monsters.conf
-import: npc/re/scripts_warps.conf
+//- Development / Testing Script Files -
+@include "npc/scripts_dev.conf"
 
-//================= Development / Testing Script Files ====================
-import: npc/scripts_dev.conf
+//- Custom Script Files -
+// Your NPCs go in this file!
+@include "npc/scripts_custom.conf"
 
-//================= Custom Script Files ===================================
-// - Your NPCs go in this file!
-import: npc/scripts_custom.conf
+) // npc_global_list
diff --git a/npc/re/scripts_mapflags.conf b/npc/re/scripts_mapflags.conf
index 9f10792ef..8727d9b44 100644
--- a/npc/re/scripts_mapflags.conf
+++ b/npc/re/scripts_mapflags.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -28,4 +28,4 @@
 //= Map Flags
 //=========================================================================
 
-npc: npc/re/mapflag/zone.txt
+"npc/re/mapflag/zone.txt",
diff --git a/npc/re/scripts_monsters.conf b/npc/re/scripts_monsters.conf
index cb8e25de6..06b3031bf 100644
--- a/npc/re/scripts_monsters.conf
+++ b/npc/re/scripts_monsters.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -29,83 +29,83 @@
 //=========================================================================
 
 //================= Misc Spawns ===========================================
-npc: npc/re/mobs/citycleaners.txt
-npc: npc/re/mobs/towns.txt
-npc: npc/re/mobs/champion.txt
+"npc/re/mobs/citycleaners.txt",
+"npc/re/mobs/towns.txt",
+"npc/re/mobs/champion.txt",
 
 //================= Dungeons ==============================================
-npc: npc/re/mobs/dungeons/abbey.txt
-npc: npc/re/mobs/dungeons/abyss.txt
-npc: npc/re/mobs/dungeons/alde_dun.txt
-npc: npc/re/mobs/dungeons/ama_dun.txt
-npc: npc/re/mobs/dungeons/anthell.txt
-npc: npc/re/mobs/dungeons/ayo_dun.txt
-npc: npc/re/mobs/dungeons/beach_dun.txt
-npc: npc/re/mobs/dungeons/bra_dun.txt
-npc: npc/re/mobs/dungeons/c_tower.txt
-npc: npc/re/mobs/dungeons/dew_dun.txt
-npc: npc/re/mobs/dungeons/dic_dun.txt
-npc: npc/re/mobs/dungeons/ecl_tdun.txt
-npc: npc/re/mobs/dungeons/ein_dun.txt
-npc: npc/re/mobs/dungeons/gef_dun.txt
-npc: npc/re/mobs/dungeons/gefenia.txt
-npc: npc/re/mobs/dungeons/glastheim.txt
-npc: npc/re/mobs/dungeons/gld_dunSE.txt
-npc: npc/re/mobs/dungeons/gld_re.txt
-npc: npc/re/mobs/dungeons/gon_dun.txt
-npc: npc/re/mobs/dungeons/ice_dun.txt
-npc: npc/re/mobs/dungeons/in_sphinx.txt
-npc: npc/re/mobs/dungeons/iz_dun.txt
-npc: npc/re/mobs/dungeons/juperos.txt
-npc: npc/re/mobs/dungeons/kh_dun.txt
-npc: npc/re/mobs/dungeons/lhz_dun.txt
-npc: npc/re/mobs/dungeons/lou_dun.txt
-npc: npc/re/mobs/dungeons/ma_dun.txt
-npc: npc/re/mobs/dungeons/mag_dun.txt
-npc: npc/re/mobs/dungeons/mal_dun.txt
-npc: npc/re/mobs/dungeons/mjo_dun.txt
-npc: npc/re/mobs/dungeons/moc_pryd.txt
-npc: npc/re/mobs/dungeons/mosk_dun.txt
-npc: npc/re/mobs/dungeons/nyd_dun.txt
-npc: npc/re/mobs/dungeons/odin.txt
-npc: npc/re/mobs/dungeons/orcsdun.txt
-npc: npc/re/mobs/dungeons/pay_dun.txt
-npc: npc/re/mobs/dungeons/prt_maze.txt
-npc: npc/re/mobs/dungeons/prt_sew.txt
-npc: npc/re/mobs/dungeons/ra_san.txt
-npc: npc/re/mobs/dungeons/tha_t.txt
-npc: npc/re/mobs/dungeons/thor_v.txt
-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
+"npc/re/mobs/dungeons/abbey.txt",
+"npc/re/mobs/dungeons/abyss.txt",
+"npc/re/mobs/dungeons/alde_dun.txt",
+"npc/re/mobs/dungeons/ama_dun.txt",
+"npc/re/mobs/dungeons/anthell.txt",
+"npc/re/mobs/dungeons/ayo_dun.txt",
+"npc/re/mobs/dungeons/beach_dun.txt",
+"npc/re/mobs/dungeons/bra_dun.txt",
+"npc/re/mobs/dungeons/c_tower.txt",
+"npc/re/mobs/dungeons/dew_dun.txt",
+"npc/re/mobs/dungeons/dic_dun.txt",
+"npc/re/mobs/dungeons/ecl_tdun.txt",
+"npc/re/mobs/dungeons/ein_dun.txt",
+"npc/re/mobs/dungeons/gef_dun.txt",
+"npc/re/mobs/dungeons/gefenia.txt",
+"npc/re/mobs/dungeons/glastheim.txt",
+"npc/re/mobs/dungeons/gld_dunSE.txt",
+"npc/re/mobs/dungeons/gld_re.txt",
+"npc/re/mobs/dungeons/gon_dun.txt",
+"npc/re/mobs/dungeons/ice_dun.txt",
+"npc/re/mobs/dungeons/in_sphinx.txt",
+"npc/re/mobs/dungeons/iz_dun.txt",
+"npc/re/mobs/dungeons/juperos.txt",
+"npc/re/mobs/dungeons/kh_dun.txt",
+"npc/re/mobs/dungeons/lhz_dun.txt",
+"npc/re/mobs/dungeons/lou_dun.txt",
+"npc/re/mobs/dungeons/ma_dun.txt",
+"npc/re/mobs/dungeons/mag_dun.txt",
+"npc/re/mobs/dungeons/mal_dun.txt",
+"npc/re/mobs/dungeons/mjo_dun.txt",
+"npc/re/mobs/dungeons/moc_pryd.txt",
+"npc/re/mobs/dungeons/mosk_dun.txt",
+"npc/re/mobs/dungeons/nyd_dun.txt",
+"npc/re/mobs/dungeons/odin.txt",
+"npc/re/mobs/dungeons/orcsdun.txt",
+"npc/re/mobs/dungeons/pay_dun.txt",
+"npc/re/mobs/dungeons/prt_maze.txt",
+"npc/re/mobs/dungeons/prt_sew.txt",
+"npc/re/mobs/dungeons/ra_san.txt",
+"npc/re/mobs/dungeons/tha_t.txt",
+"npc/re/mobs/dungeons/thor_v.txt",
+"npc/re/mobs/dungeons/treasure.txt",
+"npc/re/mobs/dungeons/tur_dun.txt",
+"npc/re/mobs/dungeons/xmas_dun.txt",
+"npc/re/mobs/dungeons/yggdrasil.txt",
 
 //================= Fields ================================================
-npc: npc/re/mobs/fields/amatsu.txt
-npc: npc/re/mobs/fields/ayothaya.txt
-npc: npc/re/mobs/fields/bifrost.txt
-npc: npc/re/mobs/fields/brasilis.txt
-npc: npc/re/mobs/fields/comodo.txt
-npc: npc/re/mobs/fields/dewata.txt
-npc: npc/re/mobs/fields/dicastes.txt
-npc: npc/re/mobs/fields/eclage.txt
-npc: npc/re/mobs/fields/einbroch.txt
-npc: npc/re/mobs/fields/geffen.txt
-npc: npc/re/mobs/fields/gonryun.txt
-npc: npc/re/mobs/fields/hugel.txt
-npc: npc/re/mobs/fields/lighthalzen.txt
-npc: npc/re/mobs/fields/louyang.txt
-npc: npc/re/mobs/fields/lutie.txt
-npc: npc/re/mobs/fields/malaya.txt
-npc: npc/re/mobs/fields/manuk.txt
-npc: npc/re/mobs/fields/mjolnir.txt
-npc: npc/re/mobs/fields/morocc.txt
-npc: npc/re/mobs/fields/moscovia.txt
-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
+"npc/re/mobs/fields/amatsu.txt",
+"npc/re/mobs/fields/ayothaya.txt",
+"npc/re/mobs/fields/bifrost.txt",
+"npc/re/mobs/fields/brasilis.txt",
+"npc/re/mobs/fields/comodo.txt",
+"npc/re/mobs/fields/dewata.txt",
+"npc/re/mobs/fields/dicastes.txt",
+"npc/re/mobs/fields/eclage.txt",
+"npc/re/mobs/fields/einbroch.txt",
+"npc/re/mobs/fields/geffen.txt",
+"npc/re/mobs/fields/gonryun.txt",
+"npc/re/mobs/fields/hugel.txt",
+"npc/re/mobs/fields/lighthalzen.txt",
+"npc/re/mobs/fields/louyang.txt",
+"npc/re/mobs/fields/lutie.txt",
+"npc/re/mobs/fields/malaya.txt",
+"npc/re/mobs/fields/manuk.txt",
+"npc/re/mobs/fields/mjolnir.txt",
+"npc/re/mobs/fields/morocc.txt",
+"npc/re/mobs/fields/moscovia.txt",
+"npc/re/mobs/fields/niflheim.txt",
+"npc/re/mobs/fields/payon.txt",
+"npc/re/mobs/fields/prontera.txt",
+"npc/re/mobs/fields/rachel.txt",
+"npc/re/mobs/fields/splendide.txt",
+"npc/re/mobs/fields/umbala.txt",
+"npc/re/mobs/fields/veins.txt",
+"npc/re/mobs/fields/yuno.txt",
diff --git a/npc/re/scripts_warps.conf b/npc/re/scripts_warps.conf
index a67432479..a5ead53e2 100644
--- a/npc/re/scripts_warps.conf
+++ b/npc/re/scripts_warps.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -29,41 +29,41 @@
 //=========================================================================
 
 //================= 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/izlude.txt
-npc: npc/re/warps/cities/malangdo.txt
-npc: npc/re/warps/cities/malaya.txt
-npc: npc/re/warps/cities/rachel.txt
-npc: npc/re/warps/cities/yggdrasil.txt
+"npc/re/warps/cities/brasilis.txt",
+"npc/re/warps/cities/dewata.txt",
+"npc/re/warps/cities/dicastes.txt",
+"npc/re/warps/cities/eclage.txt",
+"npc/re/warps/cities/izlude.txt",
+"npc/re/warps/cities/malangdo.txt",
+"npc/re/warps/cities/malaya.txt",
+"npc/re/warps/cities/rachel.txt",
+"npc/re/warps/cities/yggdrasil.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
-npc: npc/re/warps/dungeons/iz_dun.txt
-npc: npc/re/warps/dungeons/moc_pryd.txt
+"npc/re/warps/dungeons/bra_dun.txt",
+"npc/re/warps/dungeons/dic_dun.txt",
+"npc/re/warps/dungeons/ecl_dun.txt",
+"npc/re/warps/dungeons/iz_dun.txt",
+"npc/re/warps/dungeons/moc_pryd.txt",
 
 //================= Fields ================================================
-npc: npc/re/warps/fields/bif_fild.txt
-npc: npc/re/warps/fields/bra_fild.txt
-npc: npc/re/warps/fields/com_fild.txt
-npc: npc/re/warps/fields/dic_fild.txt
-npc: npc/re/warps/fields/geffen_fild.txt
-npc: npc/re/warps/fields/hugel_fild.txt
-npc: npc/re/warps/fields/morroc_fild.txt
-npc: npc/re/warps/fields/payon_fild.txt
-npc: npc/re/warps/fields/prontera_fild.txt
-npc: npc/re/warps/fields/rachel_fild.txt
-npc: npc/re/warps/fields/veins_fild.txt
-npc: npc/re/warps/fields/yuno_fild.txt
+"npc/re/warps/fields/bif_fild.txt",
+"npc/re/warps/fields/bra_fild.txt",
+"npc/re/warps/fields/com_fild.txt",
+"npc/re/warps/fields/dic_fild.txt",
+"npc/re/warps/fields/geffen_fild.txt",
+"npc/re/warps/fields/hugel_fild.txt",
+"npc/re/warps/fields/morroc_fild.txt",
+"npc/re/warps/fields/payon_fild.txt",
+"npc/re/warps/fields/prontera_fild.txt",
+"npc/re/warps/fields/rachel_fild.txt",
+"npc/re/warps/fields/veins_fild.txt",
+"npc/re/warps/fields/yuno_fild.txt",
 
 //================= Others ================================================
-npc: npc/re/warps/other/arena.txt
-npc: npc/re/warps/other/jobquests.txt
-npc: npc/re/warps/other/paradise.txt
-npc: npc/re/warps/other/s_workshop.txt
-npc: npc/re/warps/other/sign.txt
-npc: npc/re/warps/guildcastles.txt
+"npc/re/warps/other/arena.txt",
+"npc/re/warps/other/jobquests.txt",
+"npc/re/warps/other/paradise.txt",
+"npc/re/warps/other/s_workshop.txt",
+"npc/re/warps/other/sign.txt",
+"npc/re/warps/guildcastles.txt",
diff --git a/npc/re/scripts_woe.conf b/npc/re/scripts_woe.conf
index 9677c55b7..957ac766d 100644
--- a/npc/re/scripts_woe.conf
+++ b/npc/re/scripts_woe.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -30,5 +30,5 @@
 
 //================= War of Emperium =======================================
 // - Hall of Abyss
-npc: npc/re/woe-fe/invest_main.txt
-npc: npc/re/woe-fe/invest_npc.txt
+"npc/re/woe-fe/invest_main.txt",
+"npc/re/woe-fe/invest_npc.txt",
diff --git a/npc/scripts.conf b/npc/scripts.conf
index 4fa9818f7..d56d7cb73 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -29,282 +29,282 @@
 //=========================================================================
 
 //================= Message of the Day ====================================
-npc: npc/MOTD.txt
+"npc/MOTD.txt",
 
 //================= Airport ===============================================
-npc: npc/airports/airships.txt
-npc: npc/airports/einbroch.txt
-npc: npc/airports/hugel.txt
-npc: npc/airports/izlude.txt
-npc: npc/airports/lighthalzen.txt
-npc: npc/airports/rachel.txt
-npc: npc/airports/yuno.txt
+"npc/airports/airships.txt",
+"npc/airports/einbroch.txt",
+"npc/airports/hugel.txt",
+"npc/airports/izlude.txt",
+"npc/airports/lighthalzen.txt",
+"npc/airports/rachel.txt",
+"npc/airports/yuno.txt",
 
 //================= Battlegrounds =========================================
 // - Flavius ----------------------------------------------------
-npc: npc/battleground/flavius/flavius_enter.txt
-npc: npc/battleground/flavius/flavius01.txt
-npc: npc/battleground/flavius/flavius02.txt
+"npc/battleground/flavius/flavius_enter.txt",
+"npc/battleground/flavius/flavius01.txt",
+"npc/battleground/flavius/flavius02.txt",
 // - Kreiger Von Midgard ----------------------------------------
-npc: npc/battleground/kvm/kvm_enter.txt
-npc: npc/battleground/kvm/kvm_item_pay.txt
-npc: npc/battleground/kvm/kvm01.txt
-npc: npc/battleground/kvm/kvm02.txt
-npc: npc/battleground/kvm/kvm03.txt
+"npc/battleground/kvm/kvm_enter.txt",
+"npc/battleground/kvm/kvm_item_pay.txt",
+"npc/battleground/kvm/kvm01.txt",
+"npc/battleground/kvm/kvm02.txt",
+"npc/battleground/kvm/kvm03.txt",
 // - Tierra Gorge -----------------------------------------------
-npc: npc/battleground/tierra/tierra_enter.txt
-npc: npc/battleground/tierra/tierra01.txt
-npc: npc/battleground/tierra/tierra02.txt
+"npc/battleground/tierra/tierra_enter.txt",
+"npc/battleground/tierra/tierra01.txt",
+"npc/battleground/tierra/tierra02.txt",
 // --------------------------------------------------------------
-npc: npc/battleground/bg_common.txt
+"npc/battleground/bg_common.txt",
 
 //================= Cities ================================================
-npc: npc/cities/alberta.txt
-npc: npc/cities/aldebaran.txt
-npc: npc/cities/amatsu.txt
-npc: npc/cities/ayothaya.txt
-npc: npc/cities/comodo.txt
-npc: npc/cities/einbech.txt
-npc: npc/cities/einbroch.txt
-npc: npc/cities/geffen.txt
-npc: npc/cities/gonryun.txt
-npc: npc/cities/hugel.txt
-npc: npc/cities/izlude.txt
-npc: npc/cities/jawaii.txt
-npc: npc/cities/lighthalzen.txt
-npc: npc/cities/louyang.txt
-npc: npc/cities/lutie.txt
-npc: npc/cities/manuk.txt
-npc: npc/cities/morocc.txt
-npc: npc/cities/moscovia.txt
-npc: npc/cities/niflheim.txt
-npc: npc/cities/payon.txt
-npc: npc/cities/prontera.txt
-npc: npc/cities/rachel.txt
-npc: npc/cities/splendide.txt
-npc: npc/cities/umbala.txt
-npc: npc/cities/veins.txt
-npc: npc/cities/yuno.txt
+"npc/cities/alberta.txt",
+"npc/cities/aldebaran.txt",
+"npc/cities/amatsu.txt",
+"npc/cities/ayothaya.txt",
+"npc/cities/comodo.txt",
+"npc/cities/einbech.txt",
+"npc/cities/einbroch.txt",
+"npc/cities/geffen.txt",
+"npc/cities/gonryun.txt",
+"npc/cities/hugel.txt",
+"npc/cities/izlude.txt",
+"npc/cities/jawaii.txt",
+"npc/cities/lighthalzen.txt",
+"npc/cities/louyang.txt",
+"npc/cities/lutie.txt",
+"npc/cities/manuk.txt",
+"npc/cities/morocc.txt",
+"npc/cities/moscovia.txt",
+"npc/cities/niflheim.txt",
+"npc/cities/payon.txt",
+"npc/cities/prontera.txt",
+"npc/cities/rachel.txt",
+"npc/cities/splendide.txt",
+"npc/cities/umbala.txt",
+"npc/cities/veins.txt",
+"npc/cities/yuno.txt",
 
 //================= Events ================================================
 // - Novice WoE -------------------------------------------------
 //   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/events/nguild/nguild_dunsw.txt
-//npc: npc/events/nguild/nguild_treas.txt
-//npc: npc/events/nguild/nguild_guardians.txt
-//npc: npc/events/nguild/nguild_warper.txt
-//npc: npc/events/nguild/nguild_ev_agit.txt
-//npc: npc/events/nguild/nguild_flags.txt
-//npc: npc/events/nguild/nguild_managers.txt
-//npc: npc/events/nguild/nguild_kafras.txt
+//"npc/events/nguild/nguild_dunsw.txt",
+//"npc/events/nguild/nguild_treas.txt",
+//"npc/events/nguild/nguild_guardians.txt",
+//"npc/events/nguild/nguild_warper.txt",
+//"npc/events/nguild/nguild_ev_agit.txt",
+//"npc/events/nguild/nguild_flags.txt",
+//"npc/events/nguild/nguild_managers.txt",
+//"npc/events/nguild/nguild_kafras.txt",
 // --------------------------------------------------------------
-//npc: npc/events/bossnia.txt
+//"npc/events/bossnia.txt",
 // - Official indian Ro Event Children Week
-//npc: npc/events/children_week.txt
+//"npc/events/children_week.txt",
 // - Official Christmas Events (iRO)
-//npc: npc/events/christmas_2005.txt
-//npc: npc/events/christmas_2008.txt
-//npc: npc/events/dumplingfestival.txt
+//"npc/events/christmas_2005.txt",
+//"npc/events/christmas_2008.txt",
+//"npc/events/dumplingfestival.txt",
 // - Official Easter (2008) Event (iRO)
-//npc: npc/events/easter_2008.txt
+//"npc/events/easter_2008.txt",
 // - Official Easter (2010) Event
-//npc: npc/events/easter_2010.txt
+//"npc/events/easter_2010.txt",
 // - Official kRO, idRO Skill Reset Event
-//npc: npc/events/event_skill_reset.txt
+//"npc/events/event_skill_reset.txt",
 // - Events related to WoE SE Guild Dungeons.
-npc: npc/events/gdevent_aru.txt
-npc: npc/events/gdevent_sch.txt
+"npc/events/gdevent_aru.txt",
+"npc/events/gdevent_sch.txt",
 // - God Item SE post-creation Event
-npc: npc/events/god_se_festival.txt
+"npc/events/god_se_festival.txt",
 // - Official Halloween Events (iRO)
-//npc: npc/events/halloween_2006.txt
-//npc: npc/events/halloween_2008.txt
-//npc: npc/events/halloween_2009.txt
+//"npc/events/halloween_2006.txt",
+//"npc/events/halloween_2008.txt",
+//"npc/events/halloween_2009.txt",
 // - Official idRO Idul Fitri Event
-//npc: npc/events/idul_fitri.txt
+//"npc/events/idul_fitri.txt",
 // - Official Lunar New Year (2008) Event (iRO)
-//npc: npc/events/lunar_2008.txt
+//"npc/events/lunar_2008.txt",
 // - Official RWC (2011) Golden Poring Event
-//npc: npc/events/RWC_2011.txt
+//"npc/events/RWC_2011.txt",
 // - Official RWC (2012) Enchants Event
-//npc: npc/events/RWC_2012.txt
+//"npc/events/RWC_2012.txt",
 // - Official Memorial Day (2009) Event (iRO)
-//npc: npc/events/MemorialDay_2008.txt
+//"npc/events/MemorialDay_2008.txt",
 // - Official St. Patrick's Day (2008) Event (iRO)
-//npc: npc/events/StPatrick_2008.txt
-//npc: npc/events/twintowers.txt
-//npc: npc/events/valentinesday.txt
+//"npc/events/StPatrick_2008.txt",
+//"npc/events/twintowers.txt",
+//"npc/events/valentinesday.txt",
 // - Official Valentine's Day Events (iRO)
-//npc: npc/events/valentinesday_2009.txt
-//npc: npc/events/valentinesday_2012.txt
-//npc: npc/events/whiteday.txt
-//npc: npc/events/xmas.txt
+//"npc/events/valentinesday_2009.txt",
+//"npc/events/valentinesday_2012.txt",
+//"npc/events/whiteday.txt",
+//"npc/events/xmas.txt",
 
 //================= Instances =============================================
-npc: npc/instances/SealedShrine.txt
-npc: npc/instances/EndlessTower.txt
-npc: npc/instances/OrcsMemory.txt
-npc: npc/instances/NydhoggsNest.txt
+"npc/instances/SealedShrine.txt",
+"npc/instances/EndlessTower.txt",
+"npc/instances/OrcsMemory.txt",
+"npc/instances/NydhoggsNest.txt",
 
 //================= Kafras & Cool Event Corp. =============================
-npc: npc/kafras/cool_event_corp.txt
-npc: npc/kafras/dts_warper.txt
-npc: npc/kafras/functions_kafras.txt
-npc: npc/kafras/kafras.txt
+"npc/kafras/cool_event_corp.txt",
+"npc/kafras/dts_warper.txt",
+"npc/kafras/functions_kafras.txt",
+"npc/kafras/kafras.txt",
 
 //================= Merchants =============================================
-npc: npc/merchants/advanced_refiner.txt
-npc: npc/merchants/alchemist.txt
-npc: npc/merchants/ammo_boxes.txt
-npc: npc/merchants/ammo_dealer.txt
-npc: npc/merchants/buying_shops.txt
-//npc: npc/merchants/clothes_dyer.txt
-npc: npc/merchants/coin_exchange.txt
-npc: npc/merchants/dye_maker.txt
-npc: npc/merchants/elemental_trader.txt
-npc: npc/merchants/enchan_arm.txt
-npc: npc/merchants/gemstone.txt
-npc: npc/merchants/hair_dyer.txt
-npc: npc/merchants/hair_style.txt
-//npc: npc/merchants/hd_refine.txt
-//npc: npc/merchants/icecream.txt
-npc: npc/merchants/inn.txt
-npc: npc/merchants/kunai_maker.txt
-npc: npc/merchants/milk_trader.txt
-npc: npc/merchants/novice_exchange.txt
-npc: npc/merchants/old_pharmacist.txt
-npc: npc/merchants/quivers.txt
-npc: npc/merchants/refine.txt
-npc: npc/merchants/renters.txt
-npc: npc/merchants/shops.txt
-npc: npc/merchants/socket_enchant.txt
-npc: npc/merchants/socket_enchant2.txt
-npc: npc/merchants/wander_pet_food.txt
+"npc/merchants/advanced_refiner.txt",
+"npc/merchants/alchemist.txt",
+"npc/merchants/ammo_boxes.txt",
+"npc/merchants/ammo_dealer.txt",
+"npc/merchants/buying_shops.txt",
+//"npc/merchants/clothes_dyer.txt",
+"npc/merchants/coin_exchange.txt",
+"npc/merchants/dye_maker.txt",
+"npc/merchants/elemental_trader.txt",
+"npc/merchants/enchan_arm.txt",
+"npc/merchants/gemstone.txt",
+"npc/merchants/hair_dyer.txt",
+"npc/merchants/hair_style.txt",
+//"npc/merchants/hd_refine.txt",
+//"npc/merchants/icecream.txt",
+"npc/merchants/inn.txt",
+"npc/merchants/kunai_maker.txt",
+"npc/merchants/milk_trader.txt",
+"npc/merchants/novice_exchange.txt",
+"npc/merchants/old_pharmacist.txt",
+"npc/merchants/quivers.txt",
+"npc/merchants/refine.txt",
+"npc/merchants/renters.txt",
+"npc/merchants/shops.txt",
+"npc/merchants/socket_enchant.txt",
+"npc/merchants/socket_enchant2.txt",
+"npc/merchants/wander_pet_food.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/merchants/cash_hair.txt
-//npc: npc/merchants/cash_trader.txt
-npc: npc/merchants/cashheadgear_dye.txt
+//"npc/merchants/cash_hair.txt",
+//"npc/merchants/cash_trader.txt",
+"npc/merchants/cashheadgear_dye.txt",
 
 //================= Others ================================================
 // - Izlude Battle Arena ----------------------------------------
-npc: npc/other/arena/arena_aco.txt
-npc: npc/other/arena/arena_lvl50.txt
-npc: npc/other/arena/arena_lvl60.txt
-npc: npc/other/arena/arena_lvl70.txt
-npc: npc/other/arena/arena_lvl80.txt
-npc: npc/other/arena/arena_party.txt
-npc: npc/other/arena/arena_point.txt
-npc: npc/other/arena/arena_room.txt
+"npc/other/arena/arena_aco.txt",
+"npc/other/arena/arena_lvl50.txt",
+"npc/other/arena/arena_lvl60.txt",
+"npc/other/arena/arena_lvl70.txt",
+"npc/other/arena/arena_lvl80.txt",
+"npc/other/arena/arena_party.txt",
+"npc/other/arena/arena_point.txt",
+"npc/other/arena/arena_room.txt",
 // --------------------------------------------------------------
-//npc: npc/other/acolyte_warp.txt
-npc: npc/other/auction.txt
-npc: npc/other/books.txt
-npc: npc/other/bulletin_boards.txt
-//npc: npc/other/card_trader.txt
-npc: npc/other/comodo_gambling.txt
-npc: npc/other/divorce.txt
-npc: npc/other/fortune.txt
-npc: npc/other/gm_npcs.txt
-npc: npc/other/guildpvp.txt
-npc: npc/other/gympass.txt
-npc: npc/other/hugel_bingo.txt
-npc: npc/other/mail.txt
-npc: npc/other/marriage.txt
-npc: npc/other/mercenary_rent.txt
-npc: npc/other/monster_museum.txt
+//"npc/other/acolyte_warp.txt",
+"npc/other/auction.txt",
+"npc/other/books.txt",
+"npc/other/bulletin_boards.txt",
+//"npc/other/card_trader.txt",
+"npc/other/comodo_gambling.txt",
+"npc/other/divorce.txt",
+"npc/other/fortune.txt",
+"npc/other/gm_npcs.txt",
+"npc/other/guildpvp.txt",
+"npc/other/gympass.txt",
+"npc/other/hugel_bingo.txt",
+"npc/other/mail.txt",
+"npc/other/marriage.txt",
+"npc/other/mercenary_rent.txt",
+"npc/other/monster_museum.txt",
 // - Hugel Monster Races
-npc: npc/other/monster_race.txt
-//npc: npc/other/msg_boards.txt
-npc: npc/other/poring_war.txt
-npc: npc/other/powernpc.txt
-npc: npc/other/pvp.txt
+"npc/other/monster_race.txt",
+//"npc/other/msg_boards.txt",
+"npc/other/poring_war.txt",
+"npc/other/powernpc.txt",
+"npc/other/pvp.txt",
 // - Turbo Track Arena
-npc: npc/other/turbo_track.txt
-npc: npc/other/item_merge.txt
+"npc/other/turbo_track.txt",
+"npc/other/item_merge.txt",
 
 //================= Quests ================================================
 // - Quests-Tutorials for basic classes (1st class quests) ------
-npc: npc/quests/first_class/tu_acolyte.txt
-npc: npc/quests/first_class/tu_archer.txt
-npc: npc/quests/first_class/tu_magician01.txt
-npc: npc/quests/first_class/tu_ma_th01.txt
-npc: npc/quests/first_class/tu_merchant.txt
-npc: npc/quests/first_class/tu_sword.txt
-npc: npc/quests/first_class/tu_thief01.txt
+"npc/quests/first_class/tu_acolyte.txt",
+"npc/quests/first_class/tu_archer.txt",
+"npc/quests/first_class/tu_magician01.txt",
+"npc/quests/first_class/tu_ma_th01.txt",
+"npc/quests/first_class/tu_merchant.txt",
+"npc/quests/first_class/tu_sword.txt",
+"npc/quests/first_class/tu_thief01.txt",
 // - Headgear Quests --------------------------------------------
-npc: npc/quests/newgears/2004_headgears.txt
-npc: npc/quests/newgears/2005_headgears.txt
-npc: npc/quests/newgears/2006_headgears.txt
-npc: npc/quests/newgears/2008_headgears.txt
-npc: npc/quests/newgears/2010_headgears.txt
+"npc/quests/newgears/2004_headgears.txt",
+"npc/quests/newgears/2005_headgears.txt",
+"npc/quests/newgears/2006_headgears.txt",
+"npc/quests/newgears/2008_headgears.txt",
+"npc/quests/newgears/2010_headgears.txt",
 // - Falicious Okolnir ------------------------------------------
 //   God Item Second Edition Quests
-npc: npc/quests/okolnir.txt
+"npc/quests/okolnir.txt",
 // - The God Item Quest -----------------------------------------
 // - Controller file, allow GMs to change variables.
-npc: npc/quests/seals/god_global.txt
-npc: npc/quests/seals/brisingamen_seal.txt
-npc: npc/quests/seals/god_weapon_creation.txt
-npc: npc/quests/seals/megingard_seal.txt
-npc: npc/quests/seals/mjolnir_seal.txt
-npc: npc/quests/seals/sleipnir_seal.txt
+"npc/quests/seals/god_global.txt",
+"npc/quests/seals/brisingamen_seal.txt",
+"npc/quests/seals/god_weapon_creation.txt",
+"npc/quests/seals/megingard_seal.txt",
+"npc/quests/seals/mjolnir_seal.txt",
+"npc/quests/seals/sleipnir_seal.txt",
 // - Seal status board.
-npc: npc/quests/seals/seal_status.txt
+"npc/quests/seals/seal_status.txt",
 // --------------------------------------------------------------
 // - Wandering Minstrel Quest
-npc: npc/quests/bard_quest.txt
-npc: npc/quests/bunnyband.txt
-npc: npc/quests/cooking_quest.txt
-npc: npc/quests/counteragent_mixture.txt
-//npc: npc/quests/dandelion_request.txt
-npc: npc/quests/doomed_swords.txt
-npc: npc/quests/doomed_swords_quest.txt
-npc: npc/quests/eye_of_hellion.txt
+"npc/quests/bard_quest.txt",
+"npc/quests/bunnyband.txt",
+"npc/quests/cooking_quest.txt",
+"npc/quests/counteragent_mixture.txt",
+//"npc/quests/dandelion_request.txt",
+"npc/quests/doomed_swords.txt",
+"npc/quests/doomed_swords_quest.txt",
+"npc/quests/eye_of_hellion.txt",
 // - Guild Relay Quests
-npc: npc/quests/guildrelay.txt
-npc: npc/quests/gunslinger_quests.txt
-npc: npc/quests/juice_maker.txt
-npc: npc/quests/kiel_hyre_quest.txt
-npc: npc/quests/lvl4_weapon_quest.txt
-npc: npc/quests/mage_solution.txt
-npc: npc/quests/monstertamers.txt
-npc: npc/quests/mrsmile.txt
-npc: npc/quests/ninja_quests.txt
-npc: npc/quests/obb_quest.txt
-npc: npc/quests/partyrelay.txt
-npc: npc/quests/quests_13_1.txt
-npc: npc/quests/quests_13_2.txt
-npc: npc/quests/quests_airship.txt
-npc: npc/quests/quests_alberta.txt
-npc: npc/quests/quests_aldebaran.txt
-npc: npc/quests/quests_amatsu.txt
-npc: npc/quests/quests_ayothaya.txt
-npc: npc/quests/quests_comodo.txt
-npc: npc/quests/quests_ein.txt
-npc: npc/quests/quests_geffen.txt
-npc: npc/quests/quests_gonryun.txt
-npc: npc/quests/quests_hugel.txt
-npc: npc/quests/quests_izlude.txt
-npc: npc/quests/quests_juperos.txt
-npc: npc/quests/quests_lighthalzen.txt
-npc: npc/quests/quests_louyang.txt
-npc: npc/quests/quests_lutie.txt
-npc: npc/quests/quests_morocc.txt
-npc: npc/quests/quests_moscovia.txt
-npc: npc/quests/quests_nameless.txt
-npc: npc/quests/quests_niflheim.txt
-npc: npc/quests/quests_payon.txt
-npc: npc/quests/quests_prontera.txt
-npc: npc/quests/quests_rachel.txt
-npc: npc/quests/quests_umbala.txt
-npc: npc/quests/quests_veins.txt
-npc: npc/quests/quests_yuno.txt
-npc: npc/quests/thana_quest.txt
+"npc/quests/guildrelay.txt",
+"npc/quests/gunslinger_quests.txt",
+"npc/quests/juice_maker.txt",
+"npc/quests/kiel_hyre_quest.txt",
+"npc/quests/lvl4_weapon_quest.txt",
+"npc/quests/mage_solution.txt",
+"npc/quests/monstertamers.txt",
+"npc/quests/mrsmile.txt",
+"npc/quests/ninja_quests.txt",
+"npc/quests/obb_quest.txt",
+"npc/quests/partyrelay.txt",
+"npc/quests/quests_13_1.txt",
+"npc/quests/quests_13_2.txt",
+"npc/quests/quests_airship.txt",
+"npc/quests/quests_alberta.txt",
+"npc/quests/quests_aldebaran.txt",
+"npc/quests/quests_amatsu.txt",
+"npc/quests/quests_ayothaya.txt",
+"npc/quests/quests_comodo.txt",
+"npc/quests/quests_ein.txt",
+"npc/quests/quests_geffen.txt",
+"npc/quests/quests_gonryun.txt",
+"npc/quests/quests_hugel.txt",
+"npc/quests/quests_izlude.txt",
+"npc/quests/quests_juperos.txt",
+"npc/quests/quests_lighthalzen.txt",
+"npc/quests/quests_louyang.txt",
+"npc/quests/quests_lutie.txt",
+"npc/quests/quests_morocc.txt",
+"npc/quests/quests_moscovia.txt",
+"npc/quests/quests_nameless.txt",
+"npc/quests/quests_niflheim.txt",
+"npc/quests/quests_payon.txt",
+"npc/quests/quests_prontera.txt",
+"npc/quests/quests_rachel.txt",
+"npc/quests/quests_umbala.txt",
+"npc/quests/quests_veins.txt",
+"npc/quests/quests_yuno.txt",
+"npc/quests/thana_quest.txt",
 // - The Sign Quest
 //   Be sure that the time zone set corresponds with the server's.
 //   For more info, read the comments in npc/quests/the_sign_quest.txt
-npc: npc/quests/the_sign_quest.txt
+"npc/quests/the_sign_quest.txt",
diff --git a/npc/scripts_custom.conf b/npc/scripts_custom.conf
index 940405beb..14384fd17 100644
--- a/npc/scripts_custom.conf
+++ b/npc/scripts_custom.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -35,103 +35,103 @@
 // All the custom scripts, remove the '//' to enable...
 // Place your scripts here!
 
-//npc: npc/location/to/script.txt
+//"npc/location/to/script.txt",
 
 //================= Basic Scripts =========================================
-//npc: npc/custom/itembind.txt
-//npc: npc/custom/warper.txt
-//npc: npc/custom/jobmaster.txt
-//npc: npc/custom/platinum_skills.txt
-//npc: npc/custom/healer.txt
-//npc: npc/custom/breeder.txt
-//npc: npc/custom/itemmall.txt
-//npc: npc/custom/stylist.txt
-//npc: npc/custom/resetnpc.txt
-//npc: npc/custom/card_remover.txt
-//npc: npc/custom/item_signer.txt
-//npc: npc/custom/woe_controller.txt
+//"npc/custom/itembind.txt",
+//"npc/custom/warper.txt",
+//"npc/custom/jobmaster.txt",
+//"npc/custom/platinum_skills.txt",
+//"npc/custom/healer.txt",
+//"npc/custom/breeder.txt",
+//"npc/custom/itemmall.txt",
+//"npc/custom/stylist.txt",
+//"npc/custom/resetnpc.txt",
+//"npc/custom/card_remover.txt",
+//"npc/custom/item_signer.txt",
+//"npc/custom/woe_controller.txt",
 
 //================= Other Scripts =========================================
 // -- MVP Arena
-//npc: npc/custom/etc/mvp_arena.txt
+//"npc/custom/etc/mvp_arena.txt",
 // -- Penal Servitude (Jails Quest)
-//npc: npc/custom/etc/penal_servitude.txt
+//"npc/custom/etc/penal_servitude.txt",
 // -- Banks
-//npc: npc/custom/etc/bank_kafra.txt
-//npc: npc/custom/etc/bank.txt
+//"npc/custom/etc/bank_kafra.txt",
+//"npc/custom/etc/bank.txt",
 // -- Lottery (very flexible)
-//npc: npc/custom/etc/lottery.txt
+//"npc/custom/etc/lottery.txt",
 // -- Stock Market (Play on it, earn money, very flexible)
-//npc: npc/custom/etc/stock_market.txt
+//"npc/custom/etc/stock_market.txt",
 // -- Russian Roulette + Rock Scissors Paper (warning! contains OBB/OVB/OCA/etc. prizes!)
-//npc: npc/custom/etc/rpsroulette.txt
+//"npc/custom/etc/rpsroulette.txt",
 // -- Black Jack
-//npc: npc/custom/etc/blackjack.txt
+//"npc/custom/etc/blackjack.txt",
 // -- Hire ninja squads to assassinate an enemy!
-//npc: npc/custom/etc/shifty_assassin.txt
+//"npc/custom/etc/shifty_assassin.txt",
 // -- Train your monsters to fight against other players' monsters
-//npc: npc/custom/etc/monster_arena.txt
+//"npc/custom/etc/monster_arena.txt",
 // -- Raceway mini-game
-//npc: npc/custom/etc/morroc_raceway.txt
+//"npc/custom/etc/morroc_raceway.txt",
 // -- Random change of Drop/Exp rates 1x ~ 1.5x every 6 hours on your server
-//npc: npc/custom/etc/floating_rates.txt
+//"npc/custom/etc/floating_rates.txt",
 // -- Wedding script that supports same-sex marriages
-//npc: npc/custom/etc/marriage.txt
+//"npc/custom/etc/marriage.txt",
 // -- Warper that works only after locations are unlocked
-//npc: npc/custom/etc/quest_warper.txt
+//"npc/custom/etc/quest_warper.txt",
 
 //================= Quest Scripts =========================================
 // -- Dynamic Quest Scripts
-//npc: npc/custom/quests/hunting_missions.txt
-//npc: npc/custom/quests/quest_shop.txt
-//npc: npc/custom/quests/questboard.txt
+//"npc/custom/quests/hunting_missions.txt",
+//"npc/custom/quests/quest_shop.txt",
+//"npc/custom/quests/questboard.txt",
 // -- Treasure Hunters Guild Quests (40 Quests + Special Guild Shop)
-//npc: npc/custom/quests/thq/THQS_ChatingNPC.txt
-//npc: npc/custom/quests/thq/THQS_GuildNPC.txt
-//npc: npc/custom/quests/thq/THQS_QuestNPC.txt
-//npc: npc/custom/quests/thq/THQS_Quests.txt
-//npc: npc/custom/quests/thq/THQS_TTShop.txt
+//"npc/custom/quests/thq/THQS_ChatingNPC.txt",
+//"npc/custom/quests/thq/THQS_GuildNPC.txt",
+//"npc/custom/quests/thq/THQS_QuestNPC.txt",
+//"npc/custom/quests/thq/THQS_Quests.txt",
+//"npc/custom/quests/thq/THQS_TTShop.txt",
 // -- Equipment Quests
-//npc: npc/custom/quests/elvenear.txt
-//npc: npc/custom/quests/sunglasses.txt
-//npc: npc/custom/quests/bandit_beard.txt
-//npc: npc/custom/quests/event_6_new_hats.txt
-//npc: npc/custom/quests/may_hats.txt
-//npc: npc/custom/quests/kings_items.txt
+//"npc/custom/quests/elvenear.txt",
+//"npc/custom/quests/sunglasses.txt",
+//"npc/custom/quests/bandit_beard.txt",
+//"npc/custom/quests/event_6_new_hats.txt",
+//"npc/custom/quests/may_hats.txt",
+//"npc/custom/quests/kings_items.txt",
 // -- Misc Item Quests
-//npc: npc/custom/quests/dead_branch.txt
-//npc: npc/custom/quests/berzebub.txt
-//npc: npc/custom/quests/jewel_case.txt
+//"npc/custom/quests/dead_branch.txt",
+//"npc/custom/quests/berzebub.txt",
+//"npc/custom/quests/jewel_case.txt",
 // -- Godly Equipment Quests (be careful!)
-//npc: npc/custom/quests/valhallen.txt
-//npc: npc/custom/quests/kaho_balmung.txt
-//npc: npc/custom/quests/kahohorn.txt
+//"npc/custom/quests/valhallen.txt",
+//"npc/custom/quests/kaho_balmung.txt",
+//"npc/custom/quests/kahohorn.txt",
 
 //================= Event Scripts =========================================
 // -- Daily Events
-//npc: npc/custom/events/disguise.txt
-//npc: npc/custom/events/mushroom_event.txt
-//npc: npc/custom/events/cluckers.txt
+//"npc/custom/events/disguise.txt",
+//"npc/custom/events/mushroom_event.txt",
+//"npc/custom/events/cluckers.txt",
 // -- Holiday Events
-//npc: npc/custom/events/xmas_rings_event.txt
-//npc: npc/custom/events/valentinesdayexp.txt
-//npc: npc/custom/events/hallow06.txt
-//npc: npc/custom/events/uneasy_cemetery.txt
+//"npc/custom/events/xmas_rings_event.txt",
+//"npc/custom/events/valentinesdayexp.txt",
+//"npc/custom/events/hallow06.txt",
+//"npc/custom/events/uneasy_cemetery.txt",
 
 //================= Unofficial Scripts ====================================
 // -- Unofficial Airplane script
-//npc: npc/custom/etc/airplane.txt
+//"npc/custom/etc/airplane.txt",
 // -- Thanatos Tower Statues Quest
-//npc: npc/custom/quests/tha_statues.txt
+//"npc/custom/quests/tha_statues.txt",
 // -- Custom quests from official Umbalian Quests
-//npc: npc/custom/quests/sphinx_mask.txt
-//npc: npc/custom/quests/umbalian_language.txt
+//"npc/custom/quests/sphinx_mask.txt",
+//"npc/custom/quests/umbalian_language.txt",
 // -- Unofficial Battlegrounds
-//npc: npc/custom/battleground/bg_common.txt
-//npc: npc/custom/battleground/bg_tierra_01.txt
-//npc: npc/custom/battleground/bg_tierra_02.txt
-//npc: npc/custom/battleground/bg_flavius_01.txt
-//npc: npc/custom/battleground/bg_flavius_02.txt
-//npc: npc/custom/battleground/bg_kvm01.txt
-//npc: npc/custom/battleground/bg_kvm02.txt
-//npc: npc/custom/battleground/bg_kvm03.txt
+//"npc/custom/battleground/bg_common.txt",
+//"npc/custom/battleground/bg_tierra_01.txt",
+//"npc/custom/battleground/bg_tierra_02.txt",
+//"npc/custom/battleground/bg_flavius_01.txt",
+//"npc/custom/battleground/bg_flavius_02.txt",
+//"npc/custom/battleground/bg_kvm01.txt",
+//"npc/custom/battleground/bg_kvm02.txt",
+//"npc/custom/battleground/bg_kvm03.txt",
diff --git a/npc/scripts_dev.conf b/npc/scripts_dev.conf
index 2d282de6e..ff4ef4c4f 100644
--- a/npc/scripts_dev.conf
+++ b/npc/scripts_dev.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2015  Hercules Dev Team
+//= Copyright (C) 2014-2016  Hercules Dev Team
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -31,4 +31,4 @@
 //=========================================================================
 
 //================= Script Engine self-test ===============================
-//npc: npc/dev/test.txt
+//"npc: npc/dev/test.txt",
diff --git a/npc/scripts_jobs.conf b/npc/scripts_jobs.conf
index 8731d773c..c95f9da9d 100644
--- a/npc/scripts_jobs.conf
+++ b/npc/scripts_jobs.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -30,68 +30,68 @@
 
 //================= Job Quests ============================================
 // - 1-1 Expanded
-npc: npc/jobs/1-1e/gunslinger.txt
-npc: npc/jobs/1-1e/ninja.txt
-npc: npc/jobs/1-1e/taekwon.txt
+"npc/jobs/1-1e/gunslinger.txt",
+"npc/jobs/1-1e/ninja.txt",
+"npc/jobs/1-1e/taekwon.txt",
 // - 2-1
-npc: npc/jobs/2-1/assassin.txt
-npc: npc/jobs/2-1/blacksmith.txt
-npc: npc/jobs/2-1/hunter.txt
-npc: npc/jobs/2-1/knight.txt
-npc: npc/jobs/2-1/priest.txt
-npc: npc/jobs/2-1/wizard.txt
+"npc/jobs/2-1/assassin.txt",
+"npc/jobs/2-1/blacksmith.txt",
+"npc/jobs/2-1/hunter.txt",
+"npc/jobs/2-1/knight.txt",
+"npc/jobs/2-1/priest.txt",
+"npc/jobs/2-1/wizard.txt",
 // - 2-1 Transcended
-npc: npc/jobs/2-1a/AssassinCross.txt
-npc: npc/jobs/2-1a/HighPriest.txt
-npc: npc/jobs/2-1a/HighWizard.txt
-npc: npc/jobs/2-1a/LordKnight.txt
-npc: npc/jobs/2-1a/Sniper.txt
-npc: npc/jobs/2-1a/WhiteSmith.txt
+"npc/jobs/2-1a/AssassinCross.txt",
+"npc/jobs/2-1a/HighPriest.txt",
+"npc/jobs/2-1a/HighWizard.txt",
+"npc/jobs/2-1a/LordKnight.txt",
+"npc/jobs/2-1a/Sniper.txt",
+"npc/jobs/2-1a/WhiteSmith.txt",
 // - 2-1 Expanded
-npc: npc/jobs/2-1e/StarGladiator.txt
+"npc/jobs/2-1e/StarGladiator.txt",
 // - 2-2
-npc: npc/jobs/2-2/alchemist.txt
-npc: npc/jobs/2-2/bard.txt
-npc: npc/jobs/2-2/crusader.txt
-npc: npc/jobs/2-2/dancer.txt
-npc: npc/jobs/2-2/monk.txt
-npc: npc/jobs/2-2/rogue.txt
-npc: npc/jobs/2-2/sage.txt
+"npc/jobs/2-2/alchemist.txt",
+"npc/jobs/2-2/bard.txt",
+"npc/jobs/2-2/crusader.txt",
+"npc/jobs/2-2/dancer.txt",
+"npc/jobs/2-2/monk.txt",
+"npc/jobs/2-2/rogue.txt",
+"npc/jobs/2-2/sage.txt",
 // - 2-2 Transcended
-npc: npc/jobs/2-2a/Champion.txt
-npc: npc/jobs/2-2a/Clown.txt
-npc: npc/jobs/2-2a/Creator.txt
-npc: npc/jobs/2-2a/Gypsy.txt
-npc: npc/jobs/2-2a/Paladin.txt
-npc: npc/jobs/2-2a/Professor.txt
-npc: npc/jobs/2-2a/Stalker.txt
+"npc/jobs/2-2a/Champion.txt",
+"npc/jobs/2-2a/Clown.txt",
+"npc/jobs/2-2a/Creator.txt",
+"npc/jobs/2-2a/Gypsy.txt",
+"npc/jobs/2-2a/Paladin.txt",
+"npc/jobs/2-2a/Professor.txt",
+"npc/jobs/2-2a/Stalker.txt",
 // - 2-2 Expanded
-npc: npc/jobs/2-2e/SoulLinker.txt
+"npc/jobs/2-2e/SoulLinker.txt",
 // - Novice
-npc: npc/jobs/novice/supernovice.txt
+"npc/jobs/novice/supernovice.txt",
 // - Transcended Quest (2-x -> High Novice)
-npc: npc/jobs/valkyrie.txt
+"npc/jobs/valkyrie.txt",
 
 //================= Skill Quests ==========================================
 // - 1-1
-npc: npc/quests/skills/acolyte_skills.txt
-npc: npc/quests/skills/archer_skills.txt
-npc: npc/quests/skills/mage_skills.txt
-npc: npc/quests/skills/merchant_skills.txt
-npc: npc/quests/skills/swordman_skills.txt
-npc: npc/quests/skills/thief_skills.txt
+"npc/quests/skills/acolyte_skills.txt",
+"npc/quests/skills/archer_skills.txt",
+"npc/quests/skills/mage_skills.txt",
+"npc/quests/skills/merchant_skills.txt",
+"npc/quests/skills/swordman_skills.txt",
+"npc/quests/skills/thief_skills.txt",
 // - 2-1
-npc: npc/quests/skills/assassin_skills.txt
-npc: npc/quests/skills/blacksmith_skills.txt
-npc: npc/quests/skills/hunter_skills.txt
-npc: npc/quests/skills/knight_skills.txt
-npc: npc/quests/skills/priest_skills.txt
-npc: npc/quests/skills/rogue_skills.txt
-npc: npc/quests/skills/wizard_skills.txt
+"npc/quests/skills/assassin_skills.txt",
+"npc/quests/skills/blacksmith_skills.txt",
+"npc/quests/skills/hunter_skills.txt",
+"npc/quests/skills/knight_skills.txt",
+"npc/quests/skills/priest_skills.txt",
+"npc/quests/skills/rogue_skills.txt",
+"npc/quests/skills/wizard_skills.txt",
 // - 2-2
-npc: npc/quests/skills/alchemist_skills.txt
-npc: npc/quests/skills/bard_skills.txt
-npc: npc/quests/skills/crusader_skills.txt
-npc: npc/quests/skills/dancer_skills.txt
-npc: npc/quests/skills/monk_skills.txt
-npc: npc/quests/skills/sage_skills.txt
+"npc/quests/skills/alchemist_skills.txt",
+"npc/quests/skills/bard_skills.txt",
+"npc/quests/skills/crusader_skills.txt",
+"npc/quests/skills/dancer_skills.txt",
+"npc/quests/skills/monk_skills.txt",
+"npc/quests/skills/sage_skills.txt",
diff --git a/npc/scripts_mapflags.conf b/npc/scripts_mapflags.conf
index 0a4f64069..c662f7562 100644
--- a/npc/scripts_mapflags.conf
+++ b/npc/scripts_mapflags.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -28,32 +28,32 @@
 //= Map Flags
 //=========================================================================
 
-npc: npc/mapflag/nopvp.txt
-npc: npc/mapflag/gvg.txt
-npc: npc/mapflag/jail.txt
-npc: npc/mapflag/nightmare.txt
-npc: npc/mapflag/nobranch.txt
-npc: npc/mapflag/noexp.txt
-npc: npc/mapflag/noicewall.txt
-npc: npc/mapflag/noloot.txt
-npc: npc/mapflag/nomemo.txt
-npc: npc/mapflag/nopenalty.txt
-npc: npc/mapflag/nosave.txt
-npc: npc/mapflag/noteleport.txt
-npc: npc/mapflag/noreturn.txt
-npc: npc/mapflag/noskill.txt
-npc: npc/mapflag/nowarp.txt
-npc: npc/mapflag/nowarpto.txt
-npc: npc/mapflag/partylock.txt
-npc: npc/mapflag/pvp.txt
-npc: npc/mapflag/pvp_noparty.txt
-npc: npc/mapflag/pvp_noguild.txt
-npc: npc/mapflag/night.txt
-npc: npc/mapflag/zone.txt
-npc: npc/mapflag/battleground.txt
-npc: npc/mapflag/novending.txt
-npc: npc/mapflag/town.txt
-npc: npc/mapflag/reset.txt
-npc: npc/mapflag/skillmodifier.txt
-npc: npc/mapflag/skillduration.txt
-npc: npc/mapflag/notomb.txt
+"npc/mapflag/nopvp.txt",
+"npc/mapflag/gvg.txt",
+"npc/mapflag/jail.txt",
+"npc/mapflag/nightmare.txt",
+"npc/mapflag/nobranch.txt",
+"npc/mapflag/noexp.txt",
+"npc/mapflag/noicewall.txt",
+"npc/mapflag/noloot.txt",
+"npc/mapflag/nomemo.txt",
+"npc/mapflag/nopenalty.txt",
+"npc/mapflag/nosave.txt",
+"npc/mapflag/noteleport.txt",
+"npc/mapflag/noreturn.txt",
+"npc/mapflag/noskill.txt",
+"npc/mapflag/nowarp.txt",
+"npc/mapflag/nowarpto.txt",
+"npc/mapflag/partylock.txt",
+"npc/mapflag/pvp.txt",
+"npc/mapflag/pvp_noparty.txt",
+"npc/mapflag/pvp_noguild.txt",
+"npc/mapflag/night.txt",
+"npc/mapflag/zone.txt",
+"npc/mapflag/battleground.txt",
+"npc/mapflag/novending.txt",
+"npc/mapflag/town.txt",
+"npc/mapflag/reset.txt",
+"npc/mapflag/skillmodifier.txt",
+"npc/mapflag/skillduration.txt",
+"npc/mapflag/notomb.txt",
diff --git a/npc/scripts_monsters.conf b/npc/scripts_monsters.conf
index 2c4cc9ea4..beab8fdf6 100644
--- a/npc/scripts_monsters.conf
+++ b/npc/scripts_monsters.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 //=========================================================================
 
 //================= Misc Spawns ===========================================
-npc: npc/mobs/citycleaners.txt
-npc: npc/mobs/jail.txt
-npc: npc/mobs/pvp.txt
-npc: npc/mobs/towns.txt
+"npc/mobs/citycleaners.txt",
+"npc/mobs/jail.txt",
+"npc/mobs/pvp.txt",
+"npc/mobs/towns.txt",
diff --git a/npc/scripts_removed.conf b/npc/scripts_removed.conf
new file mode 100644
index 000000000..c1089466c
--- /dev/null
+++ b/npc/scripts_removed.conf
@@ -0,0 +1,37 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Hercules global npc removed list
+//=========================================================================
+// All NPCs that you wish to remove from your loading list should be put in
+// this file
+//=========================================================================
+
+// If instead of a path to an NPC is put "all" no file will be loaded
+npc_removed_list: (
+	//"all",
+	//"path/to/npc",
+) // removed
diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf
index 05dd4ede2..c89d75089 100644
--- a/npc/scripts_warps.conf
+++ b/npc/scripts_warps.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -29,87 +29,87 @@
 //=========================================================================
 
 //================= Cities ================================================
-npc: npc/warps/cities/alberta.txt
-npc: npc/warps/cities/aldebaran.txt
-npc: npc/warps/cities/amatsu.txt
-npc: npc/warps/cities/ayothaya.txt
-npc: npc/warps/cities/comodo.txt
-npc: npc/warps/cities/einbech.txt
-npc: npc/warps/cities/einbroch.txt
-npc: npc/warps/cities/geffen.txt
-npc: npc/warps/cities/gonryun.txt
-npc: npc/warps/cities/hugel.txt
-npc: npc/warps/cities/lighthalzen.txt
-npc: npc/warps/cities/louyang.txt
-npc: npc/warps/cities/lutie.txt
-npc: npc/warps/cities/manuk.txt
-npc: npc/warps/cities/mid_camp.txt
-npc: npc/warps/cities/morroc.txt
-npc: npc/warps/cities/moscovia.txt
-npc: npc/warps/cities/nameless.txt
-npc: npc/warps/cities/niflheim.txt
-npc: npc/warps/cities/payon.txt
-npc: npc/warps/cities/prontera.txt
-npc: npc/warps/cities/splendide.txt
-npc: npc/warps/cities/umbala.txt
-npc: npc/warps/cities/veins.txt
-npc: npc/warps/cities/yuno.txt
+"npc/warps/cities/alberta.txt",
+"npc/warps/cities/aldebaran.txt",
+"npc/warps/cities/amatsu.txt",
+"npc/warps/cities/ayothaya.txt",
+"npc/warps/cities/comodo.txt",
+"npc/warps/cities/einbech.txt",
+"npc/warps/cities/einbroch.txt",
+"npc/warps/cities/geffen.txt",
+"npc/warps/cities/gonryun.txt",
+"npc/warps/cities/hugel.txt",
+"npc/warps/cities/lighthalzen.txt",
+"npc/warps/cities/louyang.txt",
+"npc/warps/cities/lutie.txt",
+"npc/warps/cities/manuk.txt",
+"npc/warps/cities/mid_camp.txt",
+"npc/warps/cities/morroc.txt",
+"npc/warps/cities/moscovia.txt",
+"npc/warps/cities/nameless.txt",
+"npc/warps/cities/niflheim.txt",
+"npc/warps/cities/payon.txt",
+"npc/warps/cities/prontera.txt",
+"npc/warps/cities/splendide.txt",
+"npc/warps/cities/umbala.txt",
+"npc/warps/cities/veins.txt",
+"npc/warps/cities/yuno.txt",
 
 //================= Dungeons ==============================================
-npc: npc/warps/dungeons/abbey.txt
-npc: npc/warps/dungeons/abyss.txt
-npc: npc/warps/dungeons/alde_dun.txt
-npc: npc/warps/dungeons/ama_dun.txt
-npc: npc/warps/dungeons/anthell.txt
-npc: npc/warps/dungeons/ayo_dun.txt
-npc: npc/warps/dungeons/beach_dun.txt
-npc: npc/warps/dungeons/c_tower.txt
-npc: npc/warps/dungeons/ein_dun.txt
-npc: npc/warps/dungeons/gef_dun.txt
-npc: npc/warps/dungeons/gon_dun.txt
-npc: npc/warps/dungeons/ice_dun.txt
-npc: npc/warps/dungeons/in_sphinx.txt
-npc: npc/warps/dungeons/iz_dun.txt
-npc: npc/warps/dungeons/juperos.txt
-npc: npc/warps/dungeons/kh_dun.txt
-npc: npc/warps/dungeons/lhz_dun.txt
-npc: npc/warps/dungeons/lou_dun.txt
-npc: npc/warps/dungeons/mag_dun.txt
-npc: npc/warps/dungeons/mjo_dun.txt
-npc: npc/warps/dungeons/moc_pryd.txt
-npc: npc/warps/dungeons/mosk_dun.txt
-npc: npc/warps/dungeons/odin.txt
-npc: npc/warps/dungeons/orcsdun.txt
-npc: npc/warps/dungeons/pay_dun.txt
-npc: npc/warps/dungeons/prt_maze.txt
-npc: npc/warps/dungeons/ra_san.txt
-npc: npc/warps/dungeons/tha_t.txt
-npc: npc/warps/dungeons/thor_v.txt
-npc: npc/warps/dungeons/treasure.txt
-npc: npc/warps/dungeons/tur_dun.txt
-npc: npc/warps/dungeons/um_dun.txt
-npc: npc/warps/dungeons/xmas_dun.txt
+"npc/warps/dungeons/abbey.txt",
+"npc/warps/dungeons/abyss.txt",
+"npc/warps/dungeons/alde_dun.txt",
+"npc/warps/dungeons/ama_dun.txt",
+"npc/warps/dungeons/anthell.txt",
+"npc/warps/dungeons/ayo_dun.txt",
+"npc/warps/dungeons/beach_dun.txt",
+"npc/warps/dungeons/c_tower.txt",
+"npc/warps/dungeons/ein_dun.txt",
+"npc/warps/dungeons/gef_dun.txt",
+"npc/warps/dungeons/gon_dun.txt",
+"npc/warps/dungeons/ice_dun.txt",
+"npc/warps/dungeons/in_sphinx.txt",
+"npc/warps/dungeons/iz_dun.txt",
+"npc/warps/dungeons/juperos.txt",
+"npc/warps/dungeons/kh_dun.txt",
+"npc/warps/dungeons/lhz_dun.txt",
+"npc/warps/dungeons/lou_dun.txt",
+"npc/warps/dungeons/mag_dun.txt",
+"npc/warps/dungeons/mjo_dun.txt",
+"npc/warps/dungeons/moc_pryd.txt",
+"npc/warps/dungeons/mosk_dun.txt",
+"npc/warps/dungeons/odin.txt",
+"npc/warps/dungeons/orcsdun.txt",
+"npc/warps/dungeons/pay_dun.txt",
+"npc/warps/dungeons/prt_maze.txt",
+"npc/warps/dungeons/ra_san.txt",
+"npc/warps/dungeons/tha_t.txt",
+"npc/warps/dungeons/thor_v.txt",
+"npc/warps/dungeons/treasure.txt",
+"npc/warps/dungeons/tur_dun.txt",
+"npc/warps/dungeons/um_dun.txt",
+"npc/warps/dungeons/xmas_dun.txt",
 
 //================= Fields ================================================
-npc: npc/warps/fields/abyss_warper.txt
-npc: npc/warps/fields/amatsu_fild.txt
-npc: npc/warps/fields/ein_fild.txt
-npc: npc/warps/fields/gefenia.txt
-npc: npc/warps/fields/glastheim.txt
-npc: npc/warps/fields/jawaii.txt
-npc: npc/warps/fields/lhalzen_fild.txt
-npc: npc/warps/fields/lutie_fild.txt
-npc: npc/warps/fields/man_fild.txt
-npc: npc/warps/fields/mtmjolnir.txt
-npc: npc/warps/fields/spl_fild.txt
-npc: npc/warps/fields/umbala_fild.txt
+"npc/warps/fields/abyss_warper.txt",
+"npc/warps/fields/amatsu_fild.txt",
+"npc/warps/fields/ein_fild.txt",
+"npc/warps/fields/gefenia.txt",
+"npc/warps/fields/glastheim.txt",
+"npc/warps/fields/jawaii.txt",
+"npc/warps/fields/lhalzen_fild.txt",
+"npc/warps/fields/lutie_fild.txt",
+"npc/warps/fields/man_fild.txt",
+"npc/warps/fields/mtmjolnir.txt",
+"npc/warps/fields/spl_fild.txt",
+"npc/warps/fields/umbala_fild.txt",
 
 //================= Others ================================================
-npc: npc/warps/other/airplane.txt
-npc: npc/warps/other/arena.txt
-npc: npc/warps/other/god.txt
-npc: npc/warps/other/jobquests.txt
-npc: npc/warps/other/kiel.txt
-npc: npc/warps/other/other.txt
-npc: npc/warps/guildcastles.txt
-npc: npc/warps/pvp.txt
+"npc/warps/other/airplane.txt",
+"npc/warps/other/arena.txt",
+"npc/warps/other/god.txt",
+"npc/warps/other/jobquests.txt",
+"npc/warps/other/kiel.txt",
+"npc/warps/other/other.txt",
+"npc/warps/guildcastles.txt",
+"npc/warps/pvp.txt",
diff --git a/npc/scripts_woe.conf b/npc/scripts_woe.conf
index 4fdaf5731..695a1a398 100644
--- a/npc/scripts_woe.conf
+++ b/npc/scripts_woe.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  Athena Dev Teams
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -30,52 +30,52 @@
 
 //================= War of Emperium =======================================
 // - Guild WoE time settings
-npc: npc/woe-fe/agit_controller.txt
+"npc/woe-fe/agit_controller.txt",
 // - Guild NPC Template file
-npc: npc/woe-fe/agit_main.txt
+"npc/woe-fe/agit_main.txt",
 // - Al De Baran
-npc: npc/woe-fe/aldeg_cas01.txt
-npc: npc/woe-fe/aldeg_cas02.txt
-npc: npc/woe-fe/aldeg_cas03.txt
-npc: npc/woe-fe/aldeg_cas04.txt
-npc: npc/woe-fe/aldeg_cas05.txt
+"npc/woe-fe/aldeg_cas01.txt",
+"npc/woe-fe/aldeg_cas02.txt",
+"npc/woe-fe/aldeg_cas03.txt",
+"npc/woe-fe/aldeg_cas04.txt",
+"npc/woe-fe/aldeg_cas05.txt",
 // - Geffen
-npc: npc/woe-fe/gefg_cas01.txt
-npc: npc/woe-fe/gefg_cas02.txt
-npc: npc/woe-fe/gefg_cas03.txt
-npc: npc/woe-fe/gefg_cas04.txt
-npc: npc/woe-fe/gefg_cas05.txt
+"npc/woe-fe/gefg_cas01.txt",
+"npc/woe-fe/gefg_cas02.txt",
+"npc/woe-fe/gefg_cas03.txt",
+"npc/woe-fe/gefg_cas04.txt",
+"npc/woe-fe/gefg_cas05.txt",
 // - Payon
-npc: npc/woe-fe/payg_cas01.txt
-npc: npc/woe-fe/payg_cas02.txt
-npc: npc/woe-fe/payg_cas03.txt
-npc: npc/woe-fe/payg_cas04.txt
-npc: npc/woe-fe/payg_cas05.txt
+"npc/woe-fe/payg_cas01.txt",
+"npc/woe-fe/payg_cas02.txt",
+"npc/woe-fe/payg_cas03.txt",
+"npc/woe-fe/payg_cas04.txt",
+"npc/woe-fe/payg_cas05.txt",
 // - Prontera
-npc: npc/woe-fe/prtg_cas01.txt
-npc: npc/woe-fe/prtg_cas02.txt
-npc: npc/woe-fe/prtg_cas03.txt
-npc: npc/woe-fe/prtg_cas04.txt
-npc: npc/woe-fe/prtg_cas05.txt
+"npc/woe-fe/prtg_cas01.txt",
+"npc/woe-fe/prtg_cas02.txt",
+"npc/woe-fe/prtg_cas03.txt",
+"npc/woe-fe/prtg_cas04.txt",
+"npc/woe-fe/prtg_cas05.txt",
 // - Treasure Room Protection
-//npc: npc/woe-fe/trs_rp.txt
+//"npc/woe-fe/trs_rp.txt",
 
 //================= War of Emperium Second Edition ========================
 // - WoE SE time settings
-npc: npc/woe-se/agit_start_se.txt
+"npc/woe-se/agit_start_se.txt",
 // - Guild NPC Template file
-npc: npc/woe-se/agit_main_se.txt
+"npc/woe-se/agit_main_se.txt",
 // - Town Flags
-npc: npc/woe-se/guild_flags.txt
+"npc/woe-se/guild_flags.txt",
 // - Arunafeltz
-npc: npc/woe-se/arug_cas01.txt
-npc: npc/woe-se/arug_cas02.txt
-npc: npc/woe-se/arug_cas03.txt
-npc: npc/woe-se/arug_cas04.txt
-npc: npc/woe-se/arug_cas05.txt
+"npc/woe-se/arug_cas01.txt",
+"npc/woe-se/arug_cas02.txt",
+"npc/woe-se/arug_cas03.txt",
+"npc/woe-se/arug_cas04.txt",
+"npc/woe-se/arug_cas05.txt",
 // - Schwaltzvalt
-npc: npc/woe-se/schg_cas01.txt
-npc: npc/woe-se/schg_cas02.txt
-npc: npc/woe-se/schg_cas03.txt
-npc: npc/woe-se/schg_cas04.txt
-npc: npc/woe-se/schg_cas05.txt
+"npc/woe-se/schg_cas01.txt",
+"npc/woe-se/schg_cas02.txt",
+"npc/woe-se/schg_cas03.txt",
+"npc/woe-se/schg_cas04.txt",
+"npc/woe-se/schg_cas05.txt",
diff --git a/src/map/map.c b/src/map/map.c
index 37885cd0b..a6e19d88f 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -4113,44 +4113,91 @@ bool map_config_read(const char *filename, bool imported)
 	return retval;
 }
 
-void map_reloadnpc_sub(char *cfgName) {
-	char line[1024], w1[1024], w2[1024];
-	FILE *fp;
-
-	nullpo_retv(cfgName);
-	fp = fopen(cfgName,"r");
-	if (fp == NULL) {
-		ShowError("Map configuration file not found at: %s\n", cfgName);
-		return;
+/**
+ * Reads 'npc_global_list'/'npc_removed_list' and adds or removes NPC sources
+ * from map-server.
+ *
+ * @param filename Path to configuration file (used in error and warning messages).
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool map_read_npclist(const char *filename, bool imported)
+{
+	struct config_t config;
+	struct config_setting_t *setting = NULL;
+	const char *import = NULL;
+	bool retval = true;
+
+	struct DBMap *deleted_npcs;
+
+	nullpo_retr(false, filename);
+
+	if (!libconfig->load_file(&config, filename))
+		return false;
+
+	deleted_npcs = strdb_alloc(DB_OPT_DUP_KEY|DB_OPT_RELEASE_KEY, MAP_NAME_LENGTH);
+
+	// Remove maps
+	if ((setting = libconfig->lookup(&config, "npc_removed_list")) != NULL) {
+		int i, del_count = libconfig->setting_length(setting);
+		for (i = 0; i < del_count; i++) {
+			const char *scriptname;
+
+			if ((scriptname = libconfig->setting_get_string_elem(setting, i)) == NULL || scriptname[0] == '\0')
+				continue;
+
+			strdb_put(deleted_npcs, scriptname, NULL);
+
+			if (imported) // Map list is empty on the first run, only do this for imported files.
+				npc->delsrcfile(scriptname);
+		}
 	}
 
-	while (fgets(line, sizeof(line), fp)) {
-		char* ptr;
+	if ((setting = libconfig->lookup(&config, "npc_global_list")) != NULL) {
+		int i, count = libconfig->setting_length(setting);
+		if (count <= 0) {
+			if (!imported) {
+				ShowWarning("map_read_npclist: no NPCs found in %s!\n", filename);
+				retval = false;
+			}
+		}
+		for (i = 0; i < count; i++) {
+			const char *scriptname;
 
-		if (line[0] == '/' && line[1] == '/')
-			continue;
-		if ((ptr = strstr(line, "//")) != NULL)
-			*ptr = '\n'; //Strip comments
-		if (sscanf(line, "%1023[^:]: %1023[^\t\r\n]", w1, w2) < 2)
-			continue;
+			if ((scriptname = libconfig->setting_get_string_elem(setting, i)) == NULL || scriptname[0] == '\0')
+				continue;
 
-		//Strip trailing spaces
-		ptr = w2 + strlen(w2);
-		while (--ptr >= w2 && *ptr == ' ');
-		ptr++;
-		*ptr = '\0';
-
-		if (strcmpi(w1, "npc") == 0)
-			npc->addsrcfile(w2);
-		else if (strcmpi(w1, "import") == 0)
-			map->reloadnpc_sub(w2);
-		else if (strcmpi(w1, "delnpc") == 0)
-			npc->delsrcfile(w2);
-		else
-			ShowWarning("Unknown setting '%s' in file %s\n", w1, cfgName);
+			if (strdb_exists(deleted_npcs, scriptname))
+				continue;
+
+			npc->addsrcfile(scriptname);
+		}
+	} else {
+		ShowError("map_read_npclist: npc_global_list was not found in %s!\n", filename);
+		retval = false;
 	}
 
-	fclose(fp);
+	db_destroy(deleted_npcs);
+
+	// import should overwrite any previous configuration, so it should be called last
+	if (libconfig->lookup_string(&config, "import", &import) == CONFIG_TRUE) {
+		const char *base_npclist = NULL;
+#ifdef RENEWAL
+		base_npclist = "npc/re/scripts_main.conf";
+#else
+		base_npclist = "npc/pre-re/scripts_main.conf";
+#endif
+		if (strcmp(import, filename) == 0 || strcmp(import, base_npclist) == 0) {
+			ShowWarning("map_read_npclist: Loop detected! Skipping 'import'...\n");
+		} else {
+			if (!map->read_npclist(import, true))
+				retval = false;
+		}
+	}
+
+	libconfig->destroy(&config);
+	return retval;
 }
 
 /**
@@ -4164,9 +4211,9 @@ void map_reloadnpc(bool clear) {
 		npc->addsrcfile("clear"); // this will clear the current script list
 
 #ifdef RENEWAL
-	map->reloadnpc_sub("npc/re/scripts_main.conf");
+	map->read_npclist("npc/re/scripts_main.conf", false);
 #else
-	map->reloadnpc_sub("npc/pre-re/scripts_main.conf");
+	map->read_npclist("npc/pre-re/scripts_main.conf", false);
 #endif
 
 	// Append extra scripts
@@ -6754,7 +6801,7 @@ void map_defaults(void) {
 	map->readgat = map_readgat;
 	map->readallmaps = map_readallmaps;
 	map->config_read = map_config_read;
-	map->reloadnpc_sub = map_reloadnpc_sub;
+	map->read_npclist = map_read_npclist;
 	map->inter_config_read = inter_config_read;
 	map->inter_config_read_database_names = inter_config_read_database_names;
 	map->inter_config_read_connection = inter_config_read_connection;
diff --git a/src/map/map.h b/src/map/map.h
index 6514ef0af..723691971 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -1188,7 +1188,7 @@ END_ZEROED_BLOCK;
 	int (*readgat) (struct map_data *m);
 	int (*readallmaps) (void);
 	bool (*config_read) (const char *filename, bool imported);
-	void (*reloadnpc_sub) (char *cfgName);
+	bool (*read_npclist) (const char *filename, bool imported);
 	bool (*inter_config_read) (const char *filename, bool imported);
 	bool (*inter_config_read_database_names) (const char *filename, const struct config_t *config, bool imported);
 	bool (*inter_config_read_connection) (const char *filename, const struct config_t *config, bool imported);
-- 
cgit v1.2.3-70-g09d2


From 17466273cf9abba44129d73a801b8ed714484e72 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Thu, 11 Feb 2016 18:53:58 +0100
Subject: Ported logs.conf to libconfig

Ported to modern Hercules and cleaned up from Panikon's commits: 2a7c931b9b4e0f9c6e7766cb25701514230ec7e3, f5b1ee3df777ba7e69f1f99abaf0d00b987fc0e3, 6d1f8f50b0e7349bdab2c53bb172d0b036e47c04

Signed-off-by: Haru <haru@dotalux.com>
---
 .gitignore                    |   1 -
 conf/import-tmpl/log_conf.txt |   0
 conf/import-tmpl/logs.conf    |  32 +++++
 conf/logs.conf                | 134 ------------------
 conf/map/logs.conf            | 172 ++++++++++++++++++++++
 src/map/log.c                 | 323 ++++++++++++++++++++++++++++++------------
 src/map/log.h                 |   7 +-
 src/map/map.c                 |   7 +-
 tools/configconverter.pl      |  27 ++++
 9 files changed, 468 insertions(+), 235 deletions(-)
 delete mode 100644 conf/import-tmpl/log_conf.txt
 create mode 100644 conf/import-tmpl/logs.conf
 delete mode 100644 conf/logs.conf
 create mode 100644 conf/map/logs.conf

(limited to 'src/map')

diff --git a/.gitignore b/.gitignore
index eaf7a3aa3..84eb50456 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,7 +61,6 @@ Thumbs.db
 # /conf/
 /conf/import/*.conf
 /conf/import/battle_conf.txt
-/conf/import/log_conf.txt
 /conf/import/msg_conf.txt
 /conf/import/packet_conf.txt
 /conf/import/script_conf.txt
diff --git a/conf/import-tmpl/log_conf.txt b/conf/import-tmpl/log_conf.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/conf/import-tmpl/logs.conf b/conf/import-tmpl/logs.conf
new file mode 100644
index 000000000..99e666d96
--- /dev/null
+++ b/conf/import-tmpl/logs.conf
@@ -0,0 +1,32 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Hercules Log local configuration file.
+//=========================================================================
+
+map_log: {
+	// See conf/map/logs.conf for details
+}
diff --git a/conf/logs.conf b/conf/logs.conf
deleted file mode 100644
index 6933e84fe..000000000
--- a/conf/logs.conf
+++ /dev/null
@@ -1,134 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Log Configuration File
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-//--------------------------------------------------------------
-
-// Enable Logs? (Note 3)
-// 0x00000 - Don't log at all
-// 0x00001 - (T) Log trades
-// 0x00002 - (V) Log vending transactions
-// 0x00004 - (P) Log items drop/picked by players
-// 0x00008 - (L) Log items drop/looted by monsters
-// 0x00010 - (S) Log NPC transactions (buy/sell)
-// 0x00020 - (N) Log Script transactions (items deleted/acquired through quests)
-// 0x00040 - (D) Log items stolen from mobs (Steal/Gank)
-// 0x00080 - (C) Log player-used items (consumables/pet&hom&merc food/items used for skills&attacks)
-// 0x00100 - (O) Log produced/ingredient items
-// 0x00200 - (U) Log MVP prize items
-// 0x00400 - (A) Log player created/deleted items (through @/# commands)
-// 0x00800 - (R) Log items placed/retrieved from storage.
-// 0x01000 - (G) Log items placed/retrieved from guild storage.
-// 0x02000 - (E) Log mail system transactions.
-// 0x04000 - (I) Log auction system transactions.
-// 0x08000 - (B) Log buying store transactions
-// 0x20000 - (K) Log account bank transactions
-// 0x10000 - (X) Log all other transactions (rentals expiring/inserting cards/items removed by item_check/
-//           rings deleted by divorce/pet egg (un)hatching/pet armor (un)equipping/Weapon Refine skill/Remove Trap skill)
-// Example: Log trades+vending+script items+created items: 1+2+32+1024 = 1059
-// Please note that moving items from inventory to cart and back is not logged by design.
-enable_logs: 0xFFFFF
-
-// Use MySQL Logs? [SQL Version Only] (Note 1)
-sql_logs: yes
-
-// LOGGING FILTERS
-// =============================================================
-// if any condition is true then the item will be logged
-// 0 = Don't log at all
-// 1 = Log any item
-// Advanced Filter Bits by item type: ||
-// 0002 - Healing items (0)
-// 0004 - Etc Items(3) + Arrows (10)
-// 0008 - Usable Items(2) + Lures,Scrolls(11) + Usable Cash Items(18)
-// 0016 - Weapon(4)
-// 0032 - Shields,Armor,Headgears,Accessories,etc(5)
-// 0064 - Cards(6)
-// 0128 - Pet Accessories(8) + Eggs(7) (well, monsters don't drop 'em but we'll use the same system for ALL logs)
-// 0256 - Log expensive items ( >= price_items_log)
-// 0512 - Log big amount of items ( >= amount_items_log)
-// 1024 - Log refined items (if their refine >= refine_items_log )
-// 2048 - Log rare items (if their drop chance <= rare_items_log )
-
-// Examples: (log filters)
-// log_filter: 1    = logs ANY items
-// log_filter: 2    = logs only HEALING items
-// log_filter: 4    = logs only Etc Items and Arrows
-// log_filter: 64   = logs only Cards
-// log_filter: 322  = logs only Healing items, Cards and those items which price is >= price_items_log
-// log_filter: 4080 = logs all items (including all rare, big amount) exept healing, etc, arrows and useble ones
-log_filter: 1
-
-// Log Items which Refine >= refine_items_log
-refine_items_log: 5
-// Log Items whith min drop rate <= rare_items_log
-// 1 = 0.01%, 100 = 1% drop chance, etc
-rare_items_log: 100
-// don't log it if the current item buy price < price_items_log
-price_items_log: 1000
-// don't log it if the current item amount < amount_items_log
-amount_items_log: 100
-//=============================================================
-
-// Log Dead Branch Usage (Note 1)
-log_branch: no
-
-// Track Zeny Changes
-// Filter settings
-// 0 - don't log; 1 - log any zeny changes; 2.....1000000 - minimal absolute logging zeny value
-log_zeny: 0
-
-// Log MVP Monster Drops (Note 1)
-// Outdated. Use Pick_Log instead. But this log could be useful to keep track slayed MVPs
-log_mvpdrop: no
-
-// Log AtCommands & Charcommands (Note 1)
-// Only commands issued by player groups ('conf/groups.conf') with
-// 'log_commands' setting set to 'true' will be logged.
-log_commands: yes
-
-// Log NPC 'logmes' commands (Note 1)
-log_npc: no
-
-// Log CHAT (Global, Whisper, Party, Guild, Main chat) (Note 3)
-// LOGGING FILTERS
-// =============================================================
-// 0 = Don't log at all
-// 1 - Log Global messages
-// 2 - Log Whisper messages
-// 4 - Log Party messages
-// 8 - Log Guild messages
-// 16 - Log Main chat messages
-// Example:
-// log_chat: 5 = logs both Whisper & Party messages
-// log_chat: 8 = logs only Guild messages
-// log_chat: 31 = logs everything
-log_chat: 0
-
-// Disable chat logging when WoE is running? (Note 1)
-log_chat_woe_disable: no
-
-// Logging files/tables
-// Following settings specify where to log to. If 'sql_logs' is
-// enabled, SQL tables are assumed, otherwise flat files.
-
-// log_gm_db: log/atcommandlog.log
-// log_branch_db: log/branchlog.log
-// log_chat_db: log/chatlog.log
-// log_mvpdrop_db: log/mvplog.log
-// log_npc_db: log/npclog.log
-// log_pick_db: log/picklog.log
-// log_zeny_db: log/zenylog.log
-
-log_gm_db: atcommandlog
-log_branch_db: branchlog
-log_chat_db: chatlog
-log_mvpdrop_db: mvplog
-log_npc_db: npclog
-log_pick_db: picklog
-log_zeny_db: zenylog
-
-import: conf/import/log_conf.txt
diff --git a/conf/map/logs.conf b/conf/map/logs.conf
new file mode 100644
index 000000000..aa4e16e95
--- /dev/null
+++ b/conf/map/logs.conf
@@ -0,0 +1,172 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Hercules Log configuration file.
+//=========================================================================
+// Note 1: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given, assume unit
+//         types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//=========================================================================
+
+map_log: {
+	// Enable Logs? (Note 3)
+	// 0x00000 - Don't log at all
+	// 0x00001 - (T) Log trades
+	// 0x00002 - (V) Log vending transactions
+	// 0x00004 - (P) Log items drop/picked by players
+	// 0x00008 - (L) Log items drop/looted by monsters
+	// 0x00010 - (S) Log NPC transactions (buy/sell)
+	// 0x00020 - (N) Log Script transactions (items deleted/acquired through quests)
+	// 0x00040 - (D) Log items stolen from mobs (Steal/Gank)
+	// 0x00080 - (C) Log player-used items (consumables/pet&hom&merc food/items used for skills&attacks)
+	// 0x00100 - (O) Log produced/ingredient items
+	// 0x00200 - (U) Log MVP prize items
+	// 0x00400 - (A) Log player created/deleted items (through @/# commands)
+	// 0x00800 - (R) Log items placed/retrieved from storage.
+	// 0x01000 - (G) Log items placed/retrieved from guild storage.
+	// 0x02000 - (E) Log mail system transactions.
+	// 0x04000 - (I) Log auction system transactions.
+	// 0x08000 - (B) Log buying store transactions
+	// 0x20000 - (K) Log account bank transactions
+	// 0x10000 - (X) Log all other transactions (rentals expiring/inserting cards/items removed by item_check/
+	//           rings deleted by divorce/pet egg (un)hatching/pet armor (un)equipping/Weapon Refine skill/Remove Trap skill)
+	// Example: Log trades+vending+script items+created items: 1+2+32+1024 = 1059
+	// Please note that moving items from inventory to cart and back is not logged by design.
+	enable: 0xFFFFF
+
+	// Logging files/tables
+	// Following settings specify where to log to. If 'use_sql' is
+	// true, SQL tables are assumed, otherwise flat files.
+	database: {
+		// Use MySQL Logs? (Note 1)
+		use_sql: true
+
+		// Flat files
+		// log_gm_db: "log/atcommandlog.log"
+		// log_branch_db: "log/branchlog.log"
+		// log_chat_db: "log/chatlog.log"
+		// log_mvpdrop_db: "log/mvplog.log"
+		// log_npc_db: "log/npclog.log"
+		// log_pick_db: "log/picklog.log"
+		// log_zeny_db: "log/zenylog.log"
+		// SQL tables
+		log_gm_db: "atcommandlog"
+		log_branch_db: "branchlog"
+		log_chat_db: "chatlog"
+		log_mvpdrop_db: "mvplog"
+		log_npc_db: "npclog"
+		log_pick_db: "picklog"
+		log_zeny_db: "zenylog"
+	}
+
+	// Log Dead Branch Usage (Note 1)
+	log_branch: false
+
+	// Track Zeny Changes
+	// Filter settings
+	// 0 - don't log; 1 - log any zeny changes; 2.....1000000 - minimal absolute logging zeny value
+	log_zeny: 0
+
+	// Log MVP Monster Drops (Note 1)
+	// Outdated. Use Pick_Log instead. But this log could be useful to keep track slayed MVPs
+	log_mvpdrop: false
+
+	// Log AtCommands & Charcommands (Note 1)
+	// Only commands issued by player groups ('conf/groups.conf') with
+	// 'log_commands' setting set to 'true' will be logged.
+	log_commands: true
+
+	// Log NPC 'logmes' commands (Note 1)
+	log_npc: false
+
+	// Logging filters
+	filter: {
+		item: {
+			// Filters
+			// if any condition is true then the item will be logged
+			// 0 = Don't log at all
+			// 1 = Log any item
+			// Advanced Filter Bits by item type: ||
+			// 0x002 - Healing items (0)
+			// 0x004 - Etc Items(3) + Arrows (10)
+			// 0x008 - Usable Items(2) + Lures,Scrolls(11) + Usable Cash Items(18)
+			// 0x010 - Weapon(4)
+			// 0x020 - Shields,Armor,Headgears,Accessories,etc(5)
+			// 0x040 - Cards(6)
+			// 0x080 - Pet Accessories(8) + Eggs(7) (well, monsters don't drop 'em but we'll use the same system for ALL logs)
+			// 0x100 - Log expensive items ( >= price_items_log)
+			// 0x200 - Log big amount of items ( >= amount_items_log)
+			// 0x400 - Log refined items (if their refine >= refine_items_log )
+			// 0x800 - Log rare items (if their drop chance <= rare_items_log )
+			// Examples: (log filters)
+			// log_filter: 1     = logs ANY items
+			// log_filter: 0x2   = logs only HEALING items
+			// log_filter: 0x4   = logs only Etc Items and Arrows
+			// log_filter: 0x40  = logs only Cards
+			// log_filter: 0x142 = logs only Healing items, Cards and those items which price is >= price_items_log
+			// log_filter: 0xff0 = logs all items (including all rare, big amount) except healing, etc, arrows and useble ones
+			log_filter: 1
+
+			// Log Items which Refine >= refine_items_log
+			refine_items_log: 5
+
+			// Log Items whith min drop rate <= rare_items_log
+			// 1 = 0.01%, 100 = 1% drop chance, etc
+			rare_items_log: 100
+
+			// don't log it if the current item buy price < price_items_log
+			price_items_log: 1000
+
+			// don't log it if the current item amount < amount_items_log
+			amount_items_log: 100
+		} // item
+
+		chat: {
+			// Log CHAT (Global, Whisper, Party, Guild, Main chat) (Note 3)
+			// LOGGING FILTERS
+			// =============================================================
+			// 0x00 = Don't log at all
+			// 0x01 - Log Global messages
+			// 0x02 - Log Whisper messages
+			// 0x04 - Log Party messages
+			// 0x08 - Log Guild messages
+			// 0x10 - Log Main chat messages
+			// Example:
+			// log_chat: 0x5 = logs both Whisper & Party messages
+			// log_chat: 0x8 = logs only Guild messages
+			// log_chat: 0x1f = logs everything
+			// FIXME: This isn't fully functional, as of now it's only checking
+			// if the log is active or not [Panikon]
+			log_chat: 0x1f
+
+			// Disable chat logging when WoE is running? (Note 1)
+			log_chat_woe_disable: false
+		} // chat
+	} // filter
+}
+
+import: "conf/import/logs.conf"
diff --git a/src/map/log.c b/src/map/log.c
index c19190d90..6131f9cf4 100644
--- a/src/map/log.c
+++ b/src/map/log.c
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2012-2015  Hercules Dev Team
+ * Copyright (C) 2012-2016  Hercules Dev Team
  * Copyright (C)  Athena Dev Teams
  *
  * Hercules is free software: you can redistribute it and/or modify
@@ -28,6 +28,7 @@
 #include "map/mob.h"
 #include "map/pc.h"
 #include "common/cbasetypes.h"
+#include "common/conf.h"
 #include "common/nullpo.h"
 #include "common/showmsg.h"
 #include "common/sql.h" // SQL_INNODB
@@ -479,119 +480,250 @@ void log_sql_final(void) {
 	logs->mysql_handle = NULL;
 }
 
-void log_set_defaults(void) {
+/**
+ * Initializes logs->config variables
+ */
+void log_set_defaults(void)
+{
 	memset(&logs->config, 0, sizeof(logs->config));
 
-	//LOG FILTER Default values
+	//map_log default values
+	logs->config.enable_logs = 0xFFFFF;
+	logs->config.commands = true;
+
+	//map_log/database default values
+	logs->config.sql_logs = true;
+	// file/table names defaults are defined inside log_config_read_database
+
+	//map_log/filter/item default values
+	logs->config.filter = 1;              // logs any item
 	logs->config.refine_items_log = 5;    // log refined items, with refine >= +5
 	logs->config.rare_items_log   = 100;  // log rare items. drop chance <= 1%
 	logs->config.price_items_log  = 1000; // 1000z
 	logs->config.amount_items_log = 100;
 }
 
-int log_config_read(const char* cfgName) {
-	static int count = 0;
-	char line[1024], w1[1024], w2[1024];
-	FILE *fp;
+/**
+ * Reads 'map_log/database' and initializes required variables.
+ *
+ * @param filename Path to configuration file (used in error and warning messages).
+ * @param config   The current config being parsed.
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool log_config_read_database(const char *filename, struct config_t *config, bool imported)
+{
+	struct config_setting_t *setting = NULL;
+
+	nullpo_retr(false, filename);
+	nullpo_retr(false, config);
+
+	if ((setting = libconfig->lookup(config, "map_log/database")) == NULL) {
+		if (imported)
+			return true;
+		ShowError("log_config_read: map_log/database was not found in %s!\n", filename);
+		return false;
+	}
+	libconfig->setting_lookup_bool_real(setting, "use_sql", &logs->config.sql_logs);
+
+	// map_log.database defaults are defined in order to not make unecessary calls to safestrncpy [Panikon]
+	if (libconfig->setting_lookup_mutable_string(setting, "log_branch_db",
+				logs->config.log_branch, sizeof(logs->config.log_branch)) == CONFIG_FALSE)
+		safestrncpy(logs->config.log_branch, "branchlog", sizeof(logs->config.log_branch));
+
+	if (libconfig->setting_lookup_mutable_string(setting, "log_pick_db",
+				logs->config.log_pick, sizeof(logs->config.log_pick)) == CONFIG_FALSE)
+		safestrncpy(logs->config.log_pick, "picklog", sizeof(logs->config.log_pick));
+
+	if (libconfig->setting_lookup_mutable_string(setting, "log_zeny_db",
+				logs->config.log_zeny, sizeof(logs->config.log_zeny)) == CONFIG_FALSE)
+		safestrncpy(logs->config.log_zeny, "zenylog", sizeof(logs->config.log_zeny));
+
+	if (libconfig->setting_lookup_mutable_string(setting, "log_mvpdrop_db",
+				logs->config.log_mvpdrop, sizeof(logs->config.log_mvpdrop)) == CONFIG_FALSE)
+		safestrncpy(logs->config.log_mvpdrop, "mvplog", sizeof(logs->config.log_mvpdrop));
+
+	if (libconfig->setting_lookup_mutable_string(setting, "log_gm_db",
+				logs->config.log_gm, sizeof(logs->config.log_gm)) == CONFIG_FALSE)
+		safestrncpy(logs->config.log_gm, "atcommandlog", sizeof(logs->config.log_gm));
+
+	if (libconfig->setting_lookup_mutable_string(setting, "log_npc_db",
+				logs->config.log_npc, sizeof(logs->config.log_npc)) == CONFIG_FALSE)
+		safestrncpy(logs->config.log_npc, "npclog", sizeof(logs->config.log_npc));
+
+	if (libconfig->setting_lookup_mutable_string(setting, "log_chat_db",
+				logs->config.log_chat, sizeof(logs->config.log_chat)) == CONFIG_FALSE)
+		safestrncpy(logs->config.log_chat, "chatlog", sizeof(logs->config.log_chat));
+
+	return true;
+}
+
+/**
+ * Reads 'map_log/filter/item' and initializes required variables.
+ *
+ * @param filename Path to configuration file (used in error and warning messages).
+ * @param config   The current config being parsed.
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool log_config_read_filter_item(const char *filename, struct config_t *config, bool imported)
+{
+	struct config_setting_t *setting = NULL;
+
+	nullpo_retr(false, filename);
+	nullpo_retr(false, config);
 
-	nullpo_retr(1, cfgName);
-	if( count++ == 0 )
+	if ((setting = libconfig->lookup(config, "map_log/filter/item")) == NULL) {
+		if (!imported)
+			ShowError("log_config_read: map_log/filter/item was not found in %s!\n", filename);
+		return false;
+	}
+	libconfig->setting_lookup_int(setting, "log_filter", &logs->config.filter);
+	libconfig->setting_lookup_int(setting, "refine_items_log", &logs->config.refine_items_log);
+	libconfig->setting_lookup_int(setting, "rare_items_log", &logs->config.rare_items_log);
+	libconfig->setting_lookup_int(setting, "price_items_log", &logs->config.price_items_log);
+	libconfig->setting_lookup_int(setting, "amount_items_log", &logs->config.amount_items_log);
+	return true;
+}
+
+/**
+ * Reads 'map_log.filter.chat' and initializes required variables.
+ *
+ * @param filename Path to configuration file (used in error and warning messages).
+ * @param config   The current config being parsed.
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool log_config_read_filter_chat(const char *filename, struct config_t *config, bool imported)
+{
+	struct config_setting_t *setting = NULL;
+
+	nullpo_retr(false, filename);
+	nullpo_retr(false, config);
+
+	if ((setting = libconfig->lookup(config, "map_log/filter/chat")) == NULL) {
+		if (!imported)
+			ShowError("log_config_read: map_log/filter/chat was not found in %s!\n", filename);
+		return false;
+	}
+	libconfig->setting_lookup_int(setting, "log_chat", &logs->config.chat);
+	libconfig->setting_lookup_bool_real(setting, "log_chat_woe_disable", &logs->config.log_chat_woe_disable);
+	return true;
+}
+
+/**
+ * Reads 'map_log.filter' and initializes required variables.
+ *
+ * @param filename Path to configuration file (used in error and warning messages).
+ * @param config   The current config being parsed.
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool log_config_read_filter(const char *filename, struct config_t *config, bool imported)
+{
+	bool retval = true;
+
+	nullpo_retr(false, filename);
+	nullpo_retr(false, config);
+
+	if (!log_config_read_filter_item(filename, config, imported))
+		retval = false;
+	if (!log_config_read_filter_chat(filename, config, imported))
+		retval = false;
+
+	return retval;
+}
+
+/**
+ * Reads 'map_log' and initializes required variables.
+ *
+ * @param filename Path to configuration file (used in error and warning messages).
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool log_config_read(const char *filename, bool imported)
+{
+	struct config_t config;
+	struct config_setting_t *setting = NULL;
+	const char *import;
+	const char *target; // Type of storage 'file'/'table'
+	int temp;
+	bool retval = true;
+
+	nullpo_retr(false, filename);
+
+	if (!imported)
 		log_set_defaults();
 
-	if( ( fp = fopen(cfgName, "r") ) == NULL ) {
-		ShowError("Log configuration file not found at: %s\n", cfgName);
-		return 1;
+	if (!libconfig->load_file(&config, filename))
+		return false;
+
+	if ((setting = libconfig->lookup(&config, "map_log")) == NULL) {
+		libconfig->destroy(&config);
+		if (imported)
+			return true;
+		ShowError("log_config_read: map_log was not found in %s!\n", filename);
+		return false;
 	}
 
-	while (fgets(line, sizeof(line), fp)) {
-		if (line[0] == '/' && line[1] == '/')
-			continue;
-
-		if (sscanf(line, "%1023[^:]: %1023[^\r\n]", w1, w2) == 2) {
-			if( strcmpi(w1, "enable_logs") == 0 )
-				logs->config.enable_logs = (e_log_pick_type)config_switch(w2);
-			else if( strcmpi(w1, "sql_logs") == 0 )
-				logs->config.sql_logs = (bool)config_switch(w2);
-//start of common filter settings
-			else if( strcmpi(w1, "rare_items_log") == 0 )
-				logs->config.rare_items_log = atoi(w2);
-			else if( strcmpi(w1, "refine_items_log") == 0 )
-				logs->config.refine_items_log = atoi(w2);
-			else if( strcmpi(w1, "price_items_log") == 0 )
-				logs->config.price_items_log = atoi(w2);
-			else if( strcmpi(w1, "amount_items_log") == 0 )
-				logs->config.amount_items_log = atoi(w2);
-//end of common filter settings
-			else if( strcmpi(w1, "log_branch") == 0 )
-				logs->config.branch = config_switch(w2);
-			else if( strcmpi(w1, "log_filter") == 0 )
-				logs->config.filter = config_switch(w2);
-			else if( strcmpi(w1, "log_zeny") == 0 )
-				logs->config.zeny = config_switch(w2);
-			else if( strcmpi(w1, "log_commands") == 0 )
-				logs->config.commands = config_switch(w2);
-			else if( strcmpi(w1, "log_npc") == 0 )
-				logs->config.npc = config_switch(w2);
-			else if( strcmpi(w1, "log_chat") == 0 )
-				logs->config.chat = config_switch(w2);
-			else if( strcmpi(w1, "log_mvpdrop") == 0 )
-				logs->config.mvpdrop = config_switch(w2);
-			else if( strcmpi(w1, "log_chat_woe_disable") == 0 )
-				logs->config.log_chat_woe_disable = (bool)config_switch(w2);
-			else if( strcmpi(w1, "log_branch_db") == 0 )
-				safestrncpy(logs->config.log_branch, w2, sizeof(logs->config.log_branch));
-			else if( strcmpi(w1, "log_pick_db") == 0 )
-				safestrncpy(logs->config.log_pick, w2, sizeof(logs->config.log_pick));
-			else if( strcmpi(w1, "log_zeny_db") == 0 )
-				safestrncpy(logs->config.log_zeny, w2, sizeof(logs->config.log_zeny));
-			else if( strcmpi(w1, "log_mvpdrop_db") == 0 )
-				safestrncpy(logs->config.log_mvpdrop, w2, sizeof(logs->config.log_mvpdrop));
-			else if( strcmpi(w1, "log_gm_db") == 0 )
-				safestrncpy(logs->config.log_gm, w2, sizeof(logs->config.log_gm));
-			else if( strcmpi(w1, "log_npc_db") == 0 )
-				safestrncpy(logs->config.log_npc, w2, sizeof(logs->config.log_npc));
-			else if( strcmpi(w1, "log_chat_db") == 0 )
-				safestrncpy(logs->config.log_chat, w2, sizeof(logs->config.log_chat));
-			//support the import command, just like any other config
-			else if( strcmpi(w1,"import") == 0 )
-				logs->config_read(w2);
-			else if (HPM->parseConf(w1, w2, HPCT_LOG))
-				; // handled by plugins
-			else
-				ShowWarning("Unknown setting '%s' in file %s\n", w1, cfgName);
-		}
+	if (libconfig->setting_lookup_int(setting, "enable", &temp) == CONFIG_TRUE) {
+		logs->config.enable_logs = temp&LOG_TYPE_ALL; // e_log_pick_type
 	}
+	libconfig->setting_lookup_int(setting, "log_zeny", &logs->config.zeny);
+	libconfig->setting_lookup_bool_real(setting, "log_branch", &logs->config.branch);
+	libconfig->setting_lookup_bool_real(setting, "log_mvpdrop", &logs->config.mvpdrop);
+	libconfig->setting_lookup_bool_real(setting, "log_commands", &logs->config.commands);
+	libconfig->setting_lookup_bool_real(setting, "log_npc", &logs->config.npc);
 
-	fclose(fp);
+	if (!log_config_read_database(filename, &config, imported))
+		retval = false;
+	if (!log_config_read_filter(filename, &config, imported))
+		retval = false;
 
-	if( --count == 0 ) {// report final logging state
-		const char* target = logs->config.sql_logs ? "table" : "file";
+	// TODO HPM->parseConf(w1, w2, HPCT_LOG);
 
-		if( logs->config.enable_logs && logs->config.filter ) {
-			ShowInfo("Logging item transactions to %s '%s'.\n", target, logs->config.log_pick);
-		}
-		if( logs->config.branch ) {
-			ShowInfo("Logging monster summon item usage to %s '%s'.\n", target, logs->config.log_pick);
-		}
-		if( logs->config.chat ) {
-			ShowInfo("Logging chat to %s '%s'.\n", target, logs->config.log_chat);
-		}
-		if( logs->config.commands ) {
-			ShowInfo("Logging commands to %s '%s'.\n", target, logs->config.log_gm);
-		}
-		if( logs->config.mvpdrop ) {
-			ShowInfo("Logging MVP monster rewards to %s '%s'.\n", target, logs->config.log_mvpdrop);
-		}
-		if( logs->config.npc ) {
-			ShowInfo("Logging 'logmes' messages to %s '%s'.\n", target, logs->config.log_npc);
-		}
-		if( logs->config.zeny ) {
-			ShowInfo("Logging Zeny transactions to %s '%s'.\n", target, logs->config.log_zeny);
+	target = logs->config.sql_logs ? "table" : "file";
+
+	if (logs->config.enable_logs && logs->config.filter)
+		ShowInfo("Logging item transactions to %s '%s'.\n", target, logs->config.log_pick);
+
+	if (logs->config.branch)
+		ShowInfo("Logging monster summon item usage to %s '%s'.\n", target, logs->config.log_branch);
+
+	if (logs->config.chat)
+		ShowInfo("Logging chat to %s '%s'.\n", target, logs->config.log_chat);
+
+	if (logs->config.commands)
+		ShowInfo("Logging commands to %s '%s'.\n", target, logs->config.log_gm);
+
+	if (logs->config.mvpdrop)
+		ShowInfo("Logging MVP monster rewards to %s '%s'.\n", target, logs->config.log_mvpdrop);
+
+	if (logs->config.npc)
+		ShowInfo("Logging 'logmes' messages to %s '%s'.\n", target, logs->config.log_npc);
+
+	if (logs->config.zeny)
+		ShowInfo("Logging Zeny transactions to %s '%s'.\n", target, logs->config.log_zeny);
+
+	logs->config_done();
+
+	// import should overwrite any previous configuration, so it should be called last
+	if (libconfig->lookup_string(&config, "import", &import) == CONFIG_TRUE) {
+		if (strcmp(import, filename) == 0 || strcmp(import, map->LOG_CONF_NAME) == 0) {
+			ShowWarning("log_config_read: Loop detected! Skipping 'import'...\n");
+		} else {
+			if (!logs->config_read(import, true))
+				retval = false;
 		}
-		logs->config_done();
 	}
 
-	return 0;
+	libconfig->destroy(&config);
+	return retval;
 }
 
 void log_config_complete(void) {
@@ -606,6 +738,9 @@ void log_config_complete(void) {
 	}
 }
 
+/**
+ * Initializes the log interface to the default values.
+ */
 void log_defaults(void) {
 	logs = &log_s;
 
diff --git a/src/map/log.h b/src/map/log.h
index 0a5e13208..7ff36d126 100644
--- a/src/map/log.h
+++ b/src/map/log.h
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2012-2015  Hercules Dev Team
+ * Copyright (C) 2012-2016  Hercules Dev Team
  * Copyright (C)  Athena Dev Teams
  *
  * Hercules is free software: you can redistribute it and/or modify
@@ -118,7 +118,8 @@ struct log_interface {
 		bool sql_logs;
 		bool log_chat_woe_disable;
 		int rare_items_log,refine_items_log,price_items_log,amount_items_log;
-		int branch, mvpdrop, zeny, commands, npc, chat;
+		int zeny, chat;
+		bool branch, mvpdrop, commands, npc;
 		char log_branch[64], log_pick[64], log_zeny[64], log_mvpdrop[64], log_gm[64], log_npc[64], log_chat[64];
 	} config;
 	/* */
@@ -146,7 +147,7 @@ struct log_interface {
 	void (*branch_sub) (struct map_session_data* sd);
 	void (*mvpdrop_sub) (struct map_session_data* sd, int monster_id, int* log_mvp);
 
-	int (*config_read) (const char* cfgName);
+	bool (*config_read) (const char *filename, bool imported);
 	void (*config_done) (void);
 	void (*sql_init) (void);
 	void (*sql_final) (void);
diff --git a/src/map/map.c b/src/map/map.c
index a6e19d88f..9be68bdf5 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -6365,7 +6365,7 @@ int do_init(int argc, char *argv[])
 	map_load_defaults();
 
 	map->INTER_CONF_NAME         = aStrdup("conf/common/inter-server.conf");
-	map->LOG_CONF_NAME           = aStrdup("conf/logs.conf");
+	map->LOG_CONF_NAME           = aStrdup("conf/map/logs.conf");
 	map->MAP_CONF_NAME           = aStrdup("conf/map/map-server.conf");
 	map->BATTLE_CONF_FILENAME    = aStrdup("conf/battle.conf");
 	map->ATCOMMAND_CONF_FILENAME = aStrdup("conf/atcommand.conf");
@@ -6399,6 +6399,7 @@ int do_init(int argc, char *argv[])
 
 		CHECK_OLD_LOCAL_CONF("conf/import/map_conf.txt", "conf/import/map-server.conf");
 		CHECK_OLD_LOCAL_CONF("conf/import/inter_conf.txt", "conf/import/inter-server.conf");
+		CHECK_OLD_LOCAL_CONF("conf/import/log_conf.txt", "conf/import/logs.conf");
 
 #undef CHECK_OLD_LOCAL_CONF
 		}
@@ -6432,7 +6433,7 @@ int do_init(int argc, char *argv[])
 		battle->config_read(map->BATTLE_CONF_FILENAME);
 		atcommand->msg_read(map->MSG_CONF_NAME, false);
 		map->inter_config_read(map->INTER_CONF_NAME, false);
-		logs->config_read(map->LOG_CONF_NAME);
+		logs->config_read(map->LOG_CONF_NAME, false);
 	}
 	script->config_read(map->SCRIPT_CONF_NAME);
 
@@ -6591,7 +6592,7 @@ void map_defaults(void) {
 	map->enable_spy = 0; //To enable/disable @spy commands, which consume too much cpu time when sending packets. [Skotlex]
 
 	map->INTER_CONF_NAME="conf/common/inter-server.conf";
-	map->LOG_CONF_NAME="conf/logs.conf";
+	map->LOG_CONF_NAME="conf/map/logs.conf";
 	map->MAP_CONF_NAME = "conf/map/map-server.conf";
 	map->BATTLE_CONF_FILENAME = "conf/battle.conf";
 	map->ATCOMMAND_CONF_FILENAME = "conf/atcommand.conf";
diff --git a/tools/configconverter.pl b/tools/configconverter.pl
index 2d5eebe72..db34de2fd 100755
--- a/tools/configconverter.pl
+++ b/tools/configconverter.pl
@@ -475,6 +475,33 @@ my @defaults = (
 			import                   => {parse => \&parsecfg_stringarr, print => \&printcfg_nil,    path => "", default => ["conf/maps.conf", "conf/import/map_conf.txt"]},
 		}
 	},
+	{
+		files => ['logs.conf', 'import/log_conf.txt'],
+		settings => {
+			enable_logs          => {parse => \&parsecfg_int,    print => \&printcfg_hexint, path => "logs:map_log/enable", default => 0xFFFFF},
+			sql_logs             => {parse => \&parsecfg_bool,   print => \&printcfg_bool,   path => "logs:map_log/database/use_sql", default => "true"},
+			log_filter           => {parse => \&parsecfg_int,    print => \&printcfg_int,    path => "logs:map_log/filter/item/", default => 1},
+			refine_items_log     => {parse => \&parsecfg_int,    print => \&printcfg_int,    path => "logs:map_log/filter/item/", default => 5},
+			rare_items_log       => {parse => \&parsecfg_int,    print => \&printcfg_int,    path => "logs:map_log/filter/item/", default => 100},
+			price_items_log      => {parse => \&parsecfg_int,    print => \&printcfg_int,    path => "logs:map_log/filter/item/", default => 1000},
+			amount_items_log     => {parse => \&parsecfg_int,    print => \&printcfg_int,    path => "logs:map_log/filter/item/", default => 100},
+			log_branch           => {parse => \&parsecfg_bool,   print => \&printcfg_bool,   path => "logs:map_log/", default => "false"},
+			log_zeny             => {parse => \&parsecfg_int,    print => \&printcfg_int,    path => "logs:map_log/", default => 0},
+			log_mvpdrop          => {parse => \&parsecfg_bool,   print => \&printcfg_bool,   path => "logs:map_log/", default => "false"},
+			log_commands         => {parse => \&parsecfg_bool,   print => \&printcfg_bool,   path => "logs:map_log/", default => "true"},
+			log_npc              => {parse => \&parsecfg_bool,   print => \&printcfg_bool,   path => "logs:map_log/", default => "false"},
+			log_chat             => {parse => \&parsecfg_int,    print => \&printcfg_int,    path => "logs:map_log/filter/chat/", default => 0},
+			log_chat_woe_disable => {parse => \&parsecfg_bool,   print => \&printcfg_bool,   path => "logs:map_log/filter/chat/", default => "false"},
+			log_gm_db            => {parse => \&parsecfg_string, print => \&printcfg_string, path => "logs:map_log/database/", default => "atcommandlog"},
+			log_branch_db        => {parse => \&parsecfg_string, print => \&printcfg_string, path => "logs:map_log/database/", default => "branchlog"},
+			log_chat_db          => {parse => \&parsecfg_string, print => \&printcfg_string, path => "logs:map_log/database/", default => "chatlog"},
+			log_mvpdrop_db       => {parse => \&parsecfg_string, print => \&printcfg_string, path => "logs:map_log/database/", default => "mvplog"},
+			log_npc_db           => {parse => \&parsecfg_string, print => \&printcfg_string, path => "logs:map_log/database/", default => "npclog"},
+			log_pick_db          => {parse => \&parsecfg_string, print => \&printcfg_string, path => "logs:map_log/database/", default => "picklog"},
+			log_zeny_db          => {parse => \&parsecfg_string, print => \&printcfg_string, path => "logs:map_log/database/", default => "zenylog"},
+			import               => {parse => \&parsecfg_string, print => \&printcfg_nil,    path => "", default => "conf/import/log_conf.txt"},
+		}
+	},
 );
 
 for (@ARGV) {
-- 
cgit v1.2.3-70-g09d2


From aa3a3f43b677f1646cc53f7a89ad11cdfd2fcc57 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Fri, 12 Feb 2016 12:43:14 +0100
Subject: Ported script.conf to libconfig

Ported to modern Hercules and cleaned up from Panikon's commits: a0e4da63ef3afcd896603398e2468876681ac54a, b5f487c2676833492a6d4044b5d1f1bb1e552b04

Signed-off-by: Haru <haru@dotalux.com>
---
 .gitignore                       |  1 -
 conf/import-tmpl/script.conf     | 32 +++++++++++++++
 conf/import-tmpl/script_conf.txt |  0
 conf/map/script.conf             | 64 ++++++++++++++++++++++++++++++
 conf/script.conf                 | 28 -------------
 src/map/map.c                    |  7 ++--
 src/map/script.c                 | 85 +++++++++++++++++++++-------------------
 src/map/script.h                 |  8 ++--
 tools/configconverter.pl         | 12 ++++++
 9 files changed, 160 insertions(+), 77 deletions(-)
 create mode 100644 conf/import-tmpl/script.conf
 delete mode 100644 conf/import-tmpl/script_conf.txt
 create mode 100644 conf/map/script.conf
 delete mode 100644 conf/script.conf

(limited to 'src/map')

diff --git a/.gitignore b/.gitignore
index 84eb50456..877d93439 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,7 +63,6 @@ Thumbs.db
 /conf/import/battle_conf.txt
 /conf/import/msg_conf.txt
 /conf/import/packet_conf.txt
-/conf/import/script_conf.txt
 
 # /log/
 /log/*.log
diff --git a/conf/import-tmpl/script.conf b/conf/import-tmpl/script.conf
new file mode 100644
index 000000000..b354b2bf6
--- /dev/null
+++ b/conf/import-tmpl/script.conf
@@ -0,0 +1,32 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Hercules Script local configuration file.
+//=========================================================================
+
+script_configuration: {
+	// See conf/map/script.conf for details
+}
diff --git a/conf/import-tmpl/script_conf.txt b/conf/import-tmpl/script_conf.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/conf/map/script.conf b/conf/map/script.conf
new file mode 100644
index 000000000..78514e637
--- /dev/null
+++ b/conf/map/script.conf
@@ -0,0 +1,64 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Hercules Script Configuration File.
+//=========================================================================
+
+script_configuration: {
+	// Specifies whether or not an error should be outputed when there's a
+	// mismatch between the number of provided arguments and of expected
+	// arguments
+	// Default: true
+	warn_func_mismatch_paramnum: true
+
+	// Specifies whether or not each built-in function's arguments are
+	// checked for correct type. When a function is given an argument
+	// different from what it expects, a warning is thrown before the
+	// function is ran anyway.
+	// Default: true
+	warn_func_mismatch_argtypes: true
+
+	// Maximum number of operations before considering a set of operations too intensive
+	// Defaults to 655360
+	check_cmdcount: 655360
+
+	// Maximum number of iterations before considering a loop infinite
+	// Defaults to 2048
+	check_gotocount: 2048
+
+	// Default value of the 'min' argument of the script command 'input'.
+	// When the 'min' argument isn't provided, this value is used instead.
+	// Defaults to 0.
+	//input_min_value: 0
+
+	// Default value of the 'max' argument of the script command 'input'.
+	// When the 'max' argument isn't provided, this value is used instead.
+	// Defaults to INT_MAX.
+	//input_max_value: 2147483647
+	input_max_value: 10000000
+}
+
+import: "conf/import/script.conf"
diff --git a/conf/script.conf b/conf/script.conf
deleted file mode 100644
index 1512aa15a..000000000
--- a/conf/script.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-//--------------------------------------------------------
-// Hercules Script Configuration File
-//--------------------------------------------------------
-
-warn_func_mismatch_paramnum: yes
-
-check_cmdcount: 655360
-
-check_gotocount: 2048
-
-// Default value of the 'min' argument of the script command 'input'.
-// When the 'min' argument isn't provided, this value is used instead.
-// Defaults to 0.
-//input_min_value: 0
-
-// Default value of the 'max' argument of the script command 'input'.
-// When the 'max' argument isn't provided, this value is used instead.
-// Defaults to INT_MAX.
-//input_max_value: 2147483647
-input_max_value: 10000000
-
-// Specifies whether or not each built-in function's arguments are checked for
-// correct type. When a function is given an argument different from what it
-// expects, a warning is thrown before the function is ran anyway.
-// Default: yes
-warn_func_mismatch_argtypes: yes
-
-import: conf/import/script_conf.txt
diff --git a/src/map/map.c b/src/map/map.c
index 9be68bdf5..afb81c33c 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -6369,7 +6369,7 @@ int do_init(int argc, char *argv[])
 	map->MAP_CONF_NAME           = aStrdup("conf/map/map-server.conf");
 	map->BATTLE_CONF_FILENAME    = aStrdup("conf/battle.conf");
 	map->ATCOMMAND_CONF_FILENAME = aStrdup("conf/atcommand.conf");
-	map->SCRIPT_CONF_NAME        = aStrdup("conf/script.conf");
+	map->SCRIPT_CONF_NAME        = aStrdup("conf/map/script.conf");
 	map->MSG_CONF_NAME           = aStrdup("conf/messages.conf");
 	map->GRF_PATH_FILENAME       = aStrdup("conf/grf-files.txt");
 
@@ -6400,6 +6400,7 @@ int do_init(int argc, char *argv[])
 		CHECK_OLD_LOCAL_CONF("conf/import/map_conf.txt", "conf/import/map-server.conf");
 		CHECK_OLD_LOCAL_CONF("conf/import/inter_conf.txt", "conf/import/inter-server.conf");
 		CHECK_OLD_LOCAL_CONF("conf/import/log_conf.txt", "conf/import/logs.conf");
+		CHECK_OLD_LOCAL_CONF("conf/import/script_conf.txt", "conf/import/script.conf");
 
 #undef CHECK_OLD_LOCAL_CONF
 		}
@@ -6435,7 +6436,7 @@ int do_init(int argc, char *argv[])
 		map->inter_config_read(map->INTER_CONF_NAME, false);
 		logs->config_read(map->LOG_CONF_NAME, false);
 	}
-	script->config_read(map->SCRIPT_CONF_NAME);
+	script->config_read(map->SCRIPT_CONF_NAME, false);
 
 	map->id_db     = idb_alloc(DB_OPT_BASE);
 	map->pc_db     = idb_alloc(DB_OPT_BASE); //Added for reliable map->id2sd() use. [Skotlex]
@@ -6596,7 +6597,7 @@ void map_defaults(void) {
 	map->MAP_CONF_NAME = "conf/map/map-server.conf";
 	map->BATTLE_CONF_FILENAME = "conf/battle.conf";
 	map->ATCOMMAND_CONF_FILENAME = "conf/atcommand.conf";
-	map->SCRIPT_CONF_NAME = "conf/script.conf";
+	map->SCRIPT_CONF_NAME = "conf/map/script.conf";
 	map->MSG_CONF_NAME = "conf/messages.conf";
 	map->GRF_PATH_FILENAME = "conf/grf-files.txt";
 
diff --git a/src/map/script.c b/src/map/script.c
index 353d57a67..09cefa500 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -4521,52 +4521,55 @@ void run_script_main(struct script_state *st) {
 	}
 }
 
-int script_config_read(char *cfgName) {
-	int i;
-	char line[1024],w1[1024],w2[1024];
-	FILE *fp;
+/**
+ * Reads 'script_configuration' and initializes required variables.
+ *
+ * @param filename Path to configuration file.
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool script_config_read(const char *filename, bool imported)
+{
+	struct config_t config;
+	struct config_setting_t * setting = NULL;
+	const char *import = NULL;
+	bool retval = true;
 
-	if( !( fp = fopen(cfgName,"r") ) ) {
-		ShowError("File not found: %s\n", cfgName);
-		return 1;
+	nullpo_retr(false, filename);
+
+	if (!libconfig->load_file(&config, filename))
+		return false;
+
+	if ((setting = libconfig->lookup(&config, "script_configuration")) == NULL) {
+		libconfig->destroy(&config);
+		if (imported)
+			return true;
+		ShowError("script_config_read: script_configuration was not found in %s!\n", filename);
+		return false;
 	}
-	while (fgets(line, sizeof(line), fp)) {
-		if (line[0] == '/' && line[1] == '/')
-			continue;
-		i = sscanf(line,"%1023[^:]: %1023[^\r\n]", w1, w2);
-		if(i!=2)
-			continue;
 
-		if(strcmpi(w1,"warn_func_mismatch_paramnum")==0) {
-			script->config.warn_func_mismatch_paramnum = config_switch(w2);
-		}
-		else if(strcmpi(w1,"check_cmdcount")==0) {
-			script->config.check_cmdcount = config_switch(w2);
-		}
-		else if(strcmpi(w1,"check_gotocount")==0) {
-			script->config.check_gotocount = config_switch(w2);
-		}
-		else if(strcmpi(w1,"input_min_value")==0) {
-			script->config.input_min_value = config_switch(w2);
-		}
-		else if(strcmpi(w1,"input_max_value")==0) {
-			script->config.input_max_value = config_switch(w2);
-		}
-		else if(strcmpi(w1,"warn_func_mismatch_argtypes")==0) {
-			script->config.warn_func_mismatch_argtypes = config_switch(w2);
-		}
-		else if(strcmpi(w1,"import")==0) {
-			script->config_read(w2);
-		}
-		else if(HPM->parseConf(w1, w2, HPCT_SCRIPT)) {
-			; // handled by plugin
+	libconfig->setting_lookup_bool_real(setting, "warn_func_mismatch_paramnum", &script->config.warn_func_mismatch_paramnum);
+	libconfig->setting_lookup_bool_real(setting, "warn_func_mismatch_argtypes", &script->config.warn_func_mismatch_argtypes);
+	libconfig->setting_lookup_int(setting, "check_cmdcount", &script->config.check_cmdcount);
+	libconfig->setting_lookup_int(setting, "check_gotocount", &script->config.check_gotocount);
+	libconfig->setting_lookup_int(setting, "input_min_value", &script->config.input_min_value);
+	libconfig->setting_lookup_int(setting, "input_max_value", &script->config.input_max_value);
+
+	// TODO HPM->parseConf(w1, w2, HPCT_SCRIPT));
+
+	// import should overwrite any previous configuration, so it should be called last
+	if (libconfig->lookup_string(&config, "import", &import) == CONFIG_TRUE) {
+		if (strcmp(import, filename) == 0 || strcmp(import, map->SCRIPT_CONF_NAME) == 0) {
+			ShowWarning("script_config_read: Loop detected! Skipping 'import'...\n");
 		} else {
-			ShowWarning("Unknown setting '%s' in file %s\n", w1, cfgName);
+			if (!script->config_read(import, true))
+				retval = false;
 		}
 	}
-	fclose(fp);
 
-	return 0;
+	libconfig->destroy(&config);
+	return retval;
 }
 
 /**
@@ -21449,8 +21452,8 @@ void script_defaults(void) {
 	script->getfuncname = script_getfuncname;
 
 	/* script_config base */
-	script->config.warn_func_mismatch_argtypes = 1;
-	script->config.warn_func_mismatch_paramnum = 1;
+	script->config.warn_func_mismatch_argtypes = true;
+	script->config.warn_func_mismatch_paramnum = true;
 	script->config.check_cmdcount = 65535;
 	script->config.check_gotocount = 2048;
 	script->config.input_min_value = 0;
diff --git a/src/map/script.h b/src/map/script.h
index 86cb20226..c4c082263 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2012-2015  Hercules Dev Team
+ * Copyright (C) 2012-2016  Hercules Dev Team
  * Copyright (C)  Athena Dev Teams
  *
  * Hercules is free software: you can redistribute it and/or modify
@@ -343,8 +343,8 @@ enum {
  **/
 
 struct Script_Config {
-	unsigned warn_func_mismatch_argtypes : 1;
-	unsigned warn_func_mismatch_paramnum : 1;
+	bool warn_func_mismatch_argtypes;
+	bool warn_func_mismatch_paramnum;
 	int check_cmdcount;
 	int check_gotocount;
 	int input_min_value;
@@ -692,7 +692,7 @@ struct script_interface {
 	void (*run_autobonus) (const char *autobonus,int id, int pos);
 	void (*cleararray_pc) (struct map_session_data* sd, const char* varname, void* value);
 	void (*setarray_pc) (struct map_session_data* sd, const char* varname, uint32 idx, void* value, int* refcache);
-	int (*config_read) (char *cfgName);
+	bool (*config_read) (const char *filename, bool imported);
 	int (*add_str) (const char* p);
 	const char* (*get_str) (int id);
 	int (*search_str) (const char* p);
diff --git a/tools/configconverter.pl b/tools/configconverter.pl
index db34de2fd..958286c49 100755
--- a/tools/configconverter.pl
+++ b/tools/configconverter.pl
@@ -502,6 +502,18 @@ my @defaults = (
 			import               => {parse => \&parsecfg_string, print => \&printcfg_nil,    path => "", default => "conf/import/log_conf.txt"},
 		}
 	},
+	{
+		files => ['script.conf', 'import/script_conf.txt'],
+		settings => {
+			warn_func_mismatch_paramnum => {parse => \&parsecfg_bool,   print => \&printcfg_bool, path => "script:script_configuration/", default => "true"},
+			check_cmdcount              => {parse => \&parsecfg_int,    print => \&printcfg_int,  path => "script:script_configuration/", default => 655360},
+			check_gotocount             => {parse => \&parsecfg_int,    print => \&printcfg_int,  path => "script:script_configuration/", default => 2048},
+			input_min_value             => {parse => \&parsecfg_int,    print => \&printcfg_int,  path => "script:script_configuration/", default => 0},
+			input_max_value             => {parse => \&parsecfg_int,    print => \&printcfg_int,  path => "script:script_configuration/", default => 10000000},
+			warn_func_mismatch_argtypes => {parse => \&parsecfg_bool,   print => \&printcfg_bool, path => "script:script_configuration/", default => "true"},
+			import                      => {parse => \&parsecfg_string, print => \&printcfg_nil,  path => "", default => "conf/import/script_conf.txt"},
+		}
+	},
 );
 
 for (@ARGV) {
-- 
cgit v1.2.3-70-g09d2


From c0e59c874786cdf3bc5863090934b8e18ba0336d Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Fri, 12 Feb 2016 16:17:30 +0100
Subject: Ported socket.conf (was packet.conf) to libconfig

Ported to modern Hercules and cleaned up from Panikon's commits: b10f2a88073882bea812c6278fdec7848102ab87, bc5007299a92898ea4630f2a977d9a1b42b6c145

Signed-off-by: Haru <haru@dotalux.com>
---
 .gitignore                       |   1 -
 conf/common/socket.conf          | 106 ++++++++++++++++
 conf/import-tmpl/packet_conf.txt |   0
 conf/import-tmpl/socket.conf     |  32 +++++
 conf/packet.conf                 |  80 ------------
 src/char/char.c                  |   1 +
 src/common/socket.c              | 263 +++++++++++++++++++++++++++++----------
 src/login/login.c                |   1 +
 src/map/map.c                    |   1 +
 tools/configconverter.pl         |  17 +++
 10 files changed, 354 insertions(+), 148 deletions(-)
 create mode 100644 conf/common/socket.conf
 delete mode 100644 conf/import-tmpl/packet_conf.txt
 create mode 100644 conf/import-tmpl/socket.conf
 delete mode 100644 conf/packet.conf

(limited to 'src/map')

diff --git a/.gitignore b/.gitignore
index 877d93439..ce3a5c14f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,6 @@ Thumbs.db
 /conf/import/*.conf
 /conf/import/battle_conf.txt
 /conf/import/msg_conf.txt
-/conf/import/packet_conf.txt
 
 # /log/
 /log/*.log
diff --git a/conf/common/socket.conf b/conf/common/socket.conf
new file mode 100644
index 000000000..0dd5386cb
--- /dev/null
+++ b/conf/common/socket.conf
@@ -0,0 +1,106 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Hercules Sockets configuration file
+//=========================================================================
+
+socket_configuration: {
+	// How long can a socket stall before closing the connection (in seconds)?
+	stall_time: 60
+
+	// Display debug reports (When something goes wrong during the report, the report is saved.)
+	debug: false
+
+	// Linux/Epoll: Maxmimum Events per cycle
+	// Default Value:
+	//	(Maxmimum Supported Connections)/2
+	// NOTE: this controls the maximum collected socket-events per-cycle (call to epoll_wait())
+	//       for example settings this to 32 will allow up to 32 events (incomming data/new connections
+	//       per server-cycle.
+	// NOTE: Recommended Settings is at least half the maxmimum supported connections
+	//       Settings this to a lower value, may cause lags/delays
+	//       Depending on available CPU Time
+	// NOTE: This Setting is only available on Linux when build using EPoll as event dispatcher!
+	//
+	//epoll_maxevents: 1024
+
+	// Maximum allowed size for clients packets in bytes.
+	// Default Values:
+	// 24576 (Clients < 20131223)
+	// 65535 (Clients >= 20131223)
+	// NOTE: To reduce the size of reported packets, lower the values of defines, which
+	//       have been customized, such as MAX_STORAGE, MAX_GUILD_STORAGE or MAX_CART.
+	// NOTE: Do not modify this setting, unless the client has been modified to support
+	//       larger packets. The client will crash, when it receives larger packets.
+	//socket_max_client_packet: 65535
+
+	//----- IP Rules Settings -----
+	ip_rules: {
+		// If IP's are checked when connecting.
+		// This also enables DDoS protection.
+		enable: true
+
+		// Order of the checks
+		//   deny,allow     : Checks deny rules, then allow rules. Allows if no rules match.
+		//   allow,deny     : Checks allow rules, then deny rules. Allows if no rules match.
+		//   mutual-failure : Allows only if an allow rule matches and no deny rules match.
+		// (default is deny,allow)
+		order: "deny,allow"
+
+		// IP rules
+		//   allow : Accepts connections from the ip range (even if flagged as DDoS)
+		//   deny  : Rejects connections from the ip range
+		// The rules are processed in order, the first matching rule of each list (allow and deny) is used
+		allow_list: (
+			//"127.0.0.1",
+			//"192.168.0.0/16",
+			//"10.0.0.0/255.0.0.0",
+			//"all",
+		)
+		deny_list: (
+			//"127.0.0.1",
+		)
+	}
+
+	//---- DDoS Protection Settings ----
+	// If ddos.count connection request are made within ddos.interval ms, it assumes it's a DDoS attack
+	ddos: {
+		// Consecutive attempts interval (msec)
+		// (default is 3000 msecs, 3 seconds)
+		interval: 3000 //ddos_interval
+
+		// Consecutive attempts trigger
+		// (default is 5 attemps)
+		count: 5 //ddos_count
+
+		// The time interval after which the threat of DDoS is assumed to be gone (ms)
+		// After this amount of time, the DDoS restrictions are lifted.
+		// (default is 600000ms, 10min)
+		autoreset: 600000 //ddos_autoreset
+	}
+}
+
+import: "conf/import/socket.conf"
diff --git a/conf/import-tmpl/packet_conf.txt b/conf/import-tmpl/packet_conf.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/conf/import-tmpl/socket.conf b/conf/import-tmpl/socket.conf
new file mode 100644
index 000000000..04d0a40c4
--- /dev/null
+++ b/conf/import-tmpl/socket.conf
@@ -0,0 +1,32 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Hercules Sockets local configuration file
+//=========================================================================
+
+socket_configuration: {
+	// See conf/common/socket.conf for details.
+}
diff --git a/conf/packet.conf b/conf/packet.conf
deleted file mode 100644
index 1780d1b4c..000000000
--- a/conf/packet.conf
+++ /dev/null
@@ -1,80 +0,0 @@
-//===== Hercules Sockets Configuration =======================
-//= Hercules Sockets Configuration File
-//===== Translated by: =======================================
-// Davidsiaw
-//============================================================
-
-// Display debug reports (When something goes wrong during the report, the report is saved.)
-debug: no
-
-// How long can a socket stall before closing the connection (in seconds)?
-stall_time: 60
-
-// Linux/Epoll: Maxmimum Events per cycle
-// Default Value: 
-//	(Maxmimum Supported Connections)/2 
-// NOTE: this controls the maximum collected socket-events per-cycle (call to epoll_wait())
-//       for example settings this to 32 will allow up to 32 events (incomming data/new connections
-//       per server-cycle.
-// NOTE: Recommended Settings is at least half the maxmimum supported connections
-//       Settings this to a lower value, may cause lags/delays
-//       Depending on available CPU Time
-// NOTE: This Setting is only available on Linux when build using EPoll as event dispatcher!
-//
-//epoll_maxevents: 1024
-
-// Maximum allowed size for clients packets in bytes (default: 65535).
-// Default Values:
-// 24576 (Clients < 20131223)
-// 65535 (Clients >= 20131223)
-// NOTE: To reduce the size of reported packets, lower the values of defines, which
-//       have been customized, such as MAX_STORAGE, MAX_GUILD_STORAGE or MAX_CART.
-// NOTE: Do not modify this setting, unless the client has been modified to support
-//       larger packets. The client will crash, when it receives larger packets.
-//socket_max_client_packet: 65535
-
-//----- IP Rules Settings -----
-
-// If IP's are checked when connecting.
-// This also enables DDoS protection.
-enable_ip_rules: yes
-
-// Order of the checks
-//   deny,allow     : Checks deny rules, then allow rules. Allows if no rules match.
-//   allow,deny     : Checks allow rules, then deny rules. Allows if no rules match.
-//   mutual-failure : Allows only if an allow rule matches and no deny rules match.
-// (default is deny,allow)
-
-order: deny,allow
-// order: allow,deny
-// order: mutual-failture
-
-// IP rules
-//   allow : Accepts connections from the ip range (even if flagged as DDoS)
-//   deny  : Rejects connections from the ip range
-// The rules are processed in order, the first matching rule of each list (allow and deny) is used
-
-// allow: 127.0.0.1
-// allow: 192.168.0.0/16
-// allow: 10.0.0.0/255.0.0.0
-// allow: all
-
-// deny: 127.0.0.1
-
-//---- DDoS Protection Settings ----
-// If ddos_count connection request are made within ddos_interval msec, it assumes it's a DDoS attack
-
-// Consecutive attempts interval (msec)
-// (default is 3000 msecs, 3 seconds)
-ddos_interval: 3000
-
-// Consecutive attempts trigger
-// (default is 5 attemps)
-ddos_count: 5
-
-// The time interval after which the threat of DDoS is assumed to be gone. (msec)
-// After this amount of time, the DDoS restrictions are lifted.
-// (default is 600000 msecs, 10 minutes)
-ddos_autoreset: 600000
-
-import: conf/import/packet_conf.txt
diff --git a/src/char/char.c b/src/char/char.c
index 62b1d8f4c..6f79a55e3 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -6211,6 +6211,7 @@ int do_init(int argc, char **argv) {
 
 		CHECK_OLD_LOCAL_CONF("conf/import/char_conf.txt", "conf/import/char-server.conf");
 		CHECK_OLD_LOCAL_CONF("conf/import/inter_conf.txt", "conf/import/inter-server.conf");
+		CHECK_OLD_LOCAL_CONF("conf/import/packet_conf.txt", "conf/import/socket.conf");
 
 #undef CHECK_OLD_LOCAL_CONF
 	}
diff --git a/src/common/socket.c b/src/common/socket.c
index c87afb2a3..cee2875d5 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -80,6 +80,8 @@ struct socket_interface *sockt;
 
 struct socket_data **session;
 
+const char *SOCKET_CONF_FILENAME = "conf/common/socket.conf";
+
 #ifdef SEND_SHORTLIST
 // Add a fd to the shortlist so that it'll be recognized as a fd that needs
 // sending done on it.
@@ -1071,14 +1073,16 @@ struct access_control {
 	uint32 mask;
 };
 
+VECTOR_STRUCT_DECL(access_control_list, struct access_control);
+
 enum aco {
 	ACO_DENY_ALLOW,
 	ACO_ALLOW_DENY,
 	ACO_MUTUAL_FAILURE
 };
 
-static VECTOR_DECL(struct access_control) access_allow;
-static VECTOR_DECL(struct access_control) access_deny;
+static struct access_control_list access_allow;
+static struct access_control_list access_deny;
 static int access_order    = ACO_DENY_ALLOW;
 static int access_debug    = 0;
 static int ddos_count      = 10;
@@ -1270,84 +1274,210 @@ int access_ipmask(const char *str, struct access_control *acc)
 	acc->mask = mask;
 	return 1;
 }
+
+/**
+ * Adds an entry to the access list.
+ *
+ * @param setting     The setting to read from.
+ * @param list_name   The list name (used in error messages).
+ * @param access_list The access list to edit.
+ *
+ * @retval false in case of failure
+ */
+bool access_list_add(struct config_setting_t *setting, const char *list_name, struct access_control_list *access_list)
+{
+	const char *temp = NULL;
+	int i, setting_length;
+
+	nullpo_retr(false, setting);
+	nullpo_retr(false, list_name);
+	nullpo_retr(false, access_list);
+
+	if ((setting_length = libconfig->setting_length(setting)) <= 0)
+		return false;
+
+	VECTOR_ENSURE(*access_list, setting_length, 1);
+	for (i = 0; i < setting_length; i++) {
+		struct access_control acc;
+		if ((temp = libconfig->setting_get_string_elem(setting, i)) == NULL) {
+			continue;
+		}
+
+		if (!access_ipmask(temp, &acc)) {
+			ShowError("access_list_add: Invalid ip or ip range %s '%d'!\n", list_name, i);
+			continue;
+		}
+		VECTOR_PUSH(*access_list, acc);
+	}
+
+	return true;
+}
+
 //////////////////////////////
 #endif  // MINICORE
 //////////////////////////////
 
-int socket_config_read(const char* cfgName)
+/**
+ * Reads 'socket_configuration/ip_rules' and initializes required variables.
+ *
+ * @param filename Path to configuration file (used in error and warning messages).
+ * @param config   The current config being parsed.
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool socket_config_read_iprules(const char *filename, struct config_t *config, bool imported)
 {
-	char line[1024],w1[1024],w2[1024];
-	FILE *fp;
+#ifndef MINICORE
+	struct config_setting_t *setting = NULL;
+	const char *temp = NULL;
+
+	nullpo_retr(false, filename);
+	nullpo_retr(false, config);
 
-	fp = fopen(cfgName, "r");
-	if(fp == NULL) {
-		ShowError("File not found: %s\n", cfgName);
-		return 1;
+	if ((setting = libconfig->lookup(config, "socket_configuration/ip_rules")) == NULL) {
+		if (imported)
+			return true;
+		ShowError("socket_config_read: socket_configuration/ip_rules was not found in %s!\n", filename);
+		return false;
 	}
+	libconfig->setting_lookup_bool(setting, "enable", &ip_rules);
 
-	while (fgets(line, sizeof(line), fp)) {
-		if(line[0] == '/' && line[1] == '/')
-			continue;
-		if (sscanf(line, "%1023[^:]: %1023[^\r\n]", w1, w2) != 2)
-			continue;
+	if (!ip_rules)
+		return true;
 
-		if (!strcmpi(w1, "stall_time")) {
-			sockt->stall_time = atoi(w2);
-			if( sockt->stall_time < 3 )
-				sockt->stall_time = 3;/* a minimum is required to refrain it from killing itself */
-		} 
-#ifdef SOCKET_EPOLL
-		else if(!strcmpi(w1, "epoll_maxevents")) {
-			epoll_maxevents = atoi(w2);
-			if(epoll_maxevents < 16){
-				epoll_maxevents = 16; // minimum that seems to be useful
-			}
+	if (libconfig->setting_lookup_string(setting, "order", &temp) == CONFIG_TRUE) {
+		if (strcmpi(temp, "deny,allow" ) == 0) {
+			access_order = ACO_DENY_ALLOW;
+		} else if (strcmpi(temp, "allow, deny") == 0) {
+			access_order = ACO_ALLOW_DENY;
+		} else if (strcmpi(temp, "mutual-failure") == 0) {
+			access_order = ACO_MUTUAL_FAILURE;
+		} else {
+			ShowWarning("socket_config_read: invalid value '%s' for socket_configuration/ip_rules/order.\n", temp);
 		}
+	}
+
+	if ((setting = libconfig->lookup(config, "socket_configuration/ip_rules/allow_list")) == NULL) {
+		if (!imported)
+			ShowError("socket_config_read: socket_configuration/ip_rules/allow_list was not found in %s!\n", filename);
+	} else {
+		access_list_add(setting, "allow_list", &access_allow);
+	}
+
+	if ((setting = libconfig->lookup(config, "socket_configuration/ip_rules/deny_list")) == NULL) {
+		if (!imported)
+			ShowError("socket_config_read: socket_configuration/ip_rules/deny_list was not found in %s!\n", filename);
+	} else {
+		access_list_add(setting, "deny_list", &access_deny);
+	}
+#endif // ! MINICORE
+
+	return true;
+}
+
+/**
+ * Reads 'socket_configuration/ddos' and initializes required variables.
+ *
+ * @param filename Path to configuration file (used in error and warning messages).
+ * @param config   The current config being parsed.
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool socket_config_read_ddos(const char *filename, struct config_t *config, bool imported)
+{
+#ifndef MINICORE
+	struct config_setting_t *setting = NULL;
+
+	nullpo_retr(false, filename);
+	nullpo_retr(false, config);
+
+	if ((setting = libconfig->lookup(config, "socket_configuration/ddos")) == NULL) {
+		if (imported)
+			return true;
+		ShowError("socket_config_read: socket_configuration/ddos was not found in %s!\n", filename);
+		return false;
+	}
+
+	libconfig->setting_lookup_int(setting, "interval", &ddos_interval);
+	libconfig->setting_lookup_int(setting, "count", &ddos_count);
+	libconfig->setting_lookup_int(setting, "autoreset", &ddos_autoreset);
+
+#endif // ! MINICORE
+	return true;
+}
+
+/**
+ * Reads 'socket_configuration' and initializes required variables.
+ *
+ * @param filename Path to configuration file.
+ * @param imported Whether the current config is imported from another file.
+ *
+ * @retval false in case of error.
+ */
+bool socket_config_read(const char *filename, bool imported)
+{
+	struct config_t config;
+	struct config_setting_t *setting = NULL;
+	const char *import;
+	int i32 = 0;
+	bool retval = true;
+
+	nullpo_retr(false, filename);
+
+	if (!libconfig->load_file(&config, filename))
+		return false;
+
+	if ((setting = libconfig->lookup(&config, "socket_configuration")) == NULL) {
+		libconfig->destroy(&config);
+		if (imported)
+			return true;
+		ShowError("socket_config_read: socket_configuration was not found in %s!\n", filename);
+		return false;
+	}
+
+	if (libconfig->setting_lookup_int(setting, "stall_time", &i32) == CONFIG_TRUE) {
+		if (i32 < 3)
+			i32 = 3; /* a minimum is required in order to refrain from killing itself */
+		sockt->stall_time = i32;
+	}
+
+#ifdef SOCKET_EPOLL
+	if (libconfig->setting_lookup_int(setting, "epoll_maxevents", &i32) == CONFIG_TRUE) {
+		if (i32 < 16)
+			i32 = 16; // minimum that seems to be useful
+		epoll_maxevents = i32;
+	}
 #endif  // SOCKET_EPOLL
+
 #ifndef MINICORE
-		else if (!strcmpi(w1, "enable_ip_rules")) {
-			ip_rules = config_switch(w2);
-		} else if (!strcmpi(w1, "order")) {
-			if (!strcmpi(w2, "deny,allow"))
-				access_order = ACO_DENY_ALLOW;
-			else if (!strcmpi(w2, "allow,deny"))
-				access_order = ACO_ALLOW_DENY;
-			else if (!strcmpi(w2, "mutual-failure"))
-				access_order = ACO_MUTUAL_FAILURE;
-		} else if (!strcmpi(w1, "allow")) {
-			struct access_control acc;
-			VECTOR_ENSURE(access_allow, 1, 1);
-			if (access_ipmask(w2, &acc))
-				VECTOR_PUSH(access_allow, acc);
-			else
-				ShowError("socket_config_read: Invalid ip or ip range '%s'!\n", line);
-		} else if (!strcmpi(w1, "deny")) {
-			struct access_control acc;
-			VECTOR_ENSURE(access_deny, 1, 1);
-			if (access_ipmask(w2, &acc))
-				VECTOR_PUSH(access_deny, acc);
-			else
-				ShowError("socket_config_read: Invalid ip or ip range '%s'!\n", line);
+	{
+		uint32 ui32 = 0;
+		libconfig->setting_lookup_bool(setting, "debug", &access_debug);
+		if (libconfig->setting_lookup_uint32(setting, "socket_max_client_packet", &ui32) == CONFIG_TRUE) {
+			socket_max_client_packet = ui32;
 		}
-		else if (!strcmpi(w1,"ddos_interval"))
-			ddos_interval = atoi(w2);
-		else if (!strcmpi(w1,"ddos_count"))
-			ddos_count = atoi(w2);
-		else if (!strcmpi(w1,"ddos_autoreset"))
-			ddos_autoreset = atoi(w2);
-		else if (!strcmpi(w1,"debug"))
-			access_debug = config_switch(w2);
-		else if (!strcmpi(w1,"socket_max_client_packet"))
-			socket_max_client_packet = strtoul(w2, NULL, 0);
-#endif  // MINICORE
-		else if (!strcmpi(w1, "import"))
-			socket_config_read(w2);
-		else
-			ShowWarning("Unknown setting '%s' in file %s\n", w1, cfgName);
 	}
 
-	fclose(fp);
-	return 0;
+	if (!socket_config_read_iprules(filename, &config, imported))
+		retval = false;
+	if (!socket_config_read_ddos(filename, &config, imported))
+		retval = false;
+#endif // MINICORE
+
+	// import should overwrite any previous configuration, so it should be called last
+	if (libconfig->lookup_string(&config, "import", &import) == CONFIG_TRUE) {
+		if (strcmp(import, filename) == 0 || strcmp(import, SOCKET_CONF_FILENAME) == 0) {
+			ShowWarning("socket_config_read: Loop detected! Skipping 'import'...\n");
+		} else {
+			if (!socket_config_read(import, true))
+				retval = false;
+		}
+	}
+
+	libconfig->destroy(&config);
+	return retval;
 }
 
 void socket_final(void)
@@ -1496,7 +1626,6 @@ int socket_getips(uint32* ips, int max)
 
 void socket_init(void)
 {
-	char *SOCKET_CONF_FILENAME = "conf/packet.conf";
 	uint64 rlim_cur = FD_SETSIZE;
 
 #ifdef WIN32
@@ -1552,7 +1681,7 @@ void socket_init(void)
 	// Get initial local ips
 	sockt->naddr_ = sockt->getips(sockt->addr_,16);
 
-	socket_config_read(SOCKET_CONF_FILENAME);
+	socket_config_read(SOCKET_CONF_FILENAME, false);
 
 #ifndef SOCKET_EPOLL
 	// Select based Event Dispatcher:
diff --git a/src/login/login.c b/src/login/login.c
index f1302b673..19293d61b 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -2032,6 +2032,7 @@ int do_init(int argc, char** argv)
 
 		CHECK_OLD_LOCAL_CONF("conf/import/login_conf.txt", "conf/import/login-server.conf");
 		CHECK_OLD_LOCAL_CONF("conf/import/inter_conf.txt", "conf/import/inter-server.conf");
+		CHECK_OLD_LOCAL_CONF("conf/import/packet_conf.txt", "conf/import/socket.conf");
 
 #undef CHECK_OLD_LOCAL_CONF
 	}
diff --git a/src/map/map.c b/src/map/map.c
index afb81c33c..17c025ff3 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -6401,6 +6401,7 @@ int do_init(int argc, char *argv[])
 		CHECK_OLD_LOCAL_CONF("conf/import/inter_conf.txt", "conf/import/inter-server.conf");
 		CHECK_OLD_LOCAL_CONF("conf/import/log_conf.txt", "conf/import/logs.conf");
 		CHECK_OLD_LOCAL_CONF("conf/import/script_conf.txt", "conf/import/script.conf");
+		CHECK_OLD_LOCAL_CONF("conf/import/packet_conf.txt", "conf/import/socket.conf");
 
 #undef CHECK_OLD_LOCAL_CONF
 		}
diff --git a/tools/configconverter.pl b/tools/configconverter.pl
index 958286c49..669e3741c 100755
--- a/tools/configconverter.pl
+++ b/tools/configconverter.pl
@@ -514,6 +514,23 @@ my @defaults = (
 			import                      => {parse => \&parsecfg_string, print => \&printcfg_nil,  path => "", default => "conf/import/script_conf.txt"},
 		}
 	},
+	{
+		files => ['packet.conf', 'import/packet_conf.txt'],
+		settings => {
+			debug                    => {parse => \&parsecfg_bool,      print => \&printcfg_bool,    path => "socket:socket_configuration/", default => "false"},
+			stall_time               => {parse => \&parsecfg_int,       print => \&printcfg_int,     path => "socket:socket_configuration/", default => 60},
+			epoll_maxevents          => {parse => \&parsecfg_int,       print => \&printcfg_int,     path => "socket:socket_configuration/", default => 1024},
+			socket_max_client_packet => {parse => \&parsecfg_int,       print => \&printcfg_int,     path => "socket:socket_configuration/", default => 65535},
+			enable_ip_rules          => {parse => \&parsecfg_bool,      print => \&printcfg_bool,    path => "socket:socket_configuration/ip_rules/enable", default => "true"},
+			order                    => {parse => \&parsecfg_string,    print => \&printcfg_string,  path => "socket:socket_configuration/ip_rules/", default => "deny,allow"},
+			allow                    => {parse => \&parsecfg_stringarr, print => \&printcfg_strlist, path => "socket:socket_configuration/ip_rules/allow_list", default => []},
+			deny                     => {parse => \&parsecfg_stringarr, print => \&printcfg_strlist, path => "socket:socket_configuration/ip_rules/deny_list", default => []},
+			ddos_interval            => {parse => \&parsecfg_int,       print => \&printcfg_int,     path => "socket:socket_configuration/ddos/interval", default => 3000},
+			ddos_count               => {parse => \&parsecfg_int,       print => \&printcfg_int,     path => "socket:socket_configuration/ddos/count", default => 5},
+			ddos_autoreset           => {parse => \&parsecfg_int,       print => \&printcfg_int,     path => "socket:socket_configuration/ddos/autoreset", default => 600000},
+			import                   => {parse => \&parsecfg_string,    print => \&printcfg_nil,     path => "", default => "conf/import/packet_conf.txt"},
+		}
+	},
 );
 
 for (@ARGV) {
-- 
cgit v1.2.3-70-g09d2


From 6cdb1e5ec2daa295b388d6c3a920b6cffe4193ce Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Sat, 13 Feb 2016 15:38:23 +0100
Subject: Ported battle.conf to libconfig

Ported to modern Hercules and cleaned up from Panikon's commits: 44fea0b3cdba6901599265220228ba4359b1f96d, 9cba05bc0811e638bbaaa6cff887d0b2c9872560

Signed-off-by: Haru <haru@dotalux.com>
---
 .gitignore                        |   1 -
 conf/battle.conf                  |  61 ------
 conf/battle/battle.conf           | 157 ---------------
 conf/battle/battleground.conf     |  17 --
 conf/battle/client.conf           | 135 -------------
 conf/battle/drops.conf            | 134 -------------
 conf/battle/exp.conf              |  91 ---------
 conf/battle/feature.conf          |  34 ----
 conf/battle/gm.conf               |  42 ----
 conf/battle/guild.conf            |  50 -----
 conf/battle/homunc.conf           |  45 -----
 conf/battle/items.conf            |  95 ---------
 conf/battle/misc.conf             | 150 --------------
 conf/battle/monster.conf          | 238 ----------------------
 conf/battle/party.conf            |  53 -----
 conf/battle/pet.conf              |  77 --------
 conf/battle/player.conf           | 191 ------------------
 conf/battle/skill.conf            | 303 ----------------------------
 conf/battle/status.conf           |  24 ---
 conf/import-tmpl/battle.conf      |  32 +++
 conf/import-tmpl/battle_conf.txt  |   0
 conf/map/battle.conf              |  87 ++++++++
 conf/map/battle/battle.conf       | 180 +++++++++++++++++
 conf/map/battle/battleground.conf |  40 ++++
 conf/map/battle/client.conf       | 158 +++++++++++++++
 conf/map/battle/drops.conf        | 157 +++++++++++++++
 conf/map/battle/exp.conf          | 114 +++++++++++
 conf/map/battle/feature.conf      |  58 ++++++
 conf/map/battle/gm.conf           |  66 +++++++
 conf/map/battle/guild.conf        |  73 +++++++
 conf/map/battle/homunc.conf       |  68 +++++++
 conf/map/battle/items.conf        | 116 +++++++++++
 conf/map/battle/misc.conf         | 173 ++++++++++++++++
 conf/map/battle/monster.conf      | 261 ++++++++++++++++++++++++
 conf/map/battle/party.conf        |  76 +++++++
 conf/map/battle/pet.conf          | 100 ++++++++++
 conf/map/battle/player.conf       | 215 ++++++++++++++++++++
 conf/map/battle/skill.conf        | 326 ++++++++++++++++++++++++++++++
 conf/map/battle/status.conf       |  47 +++++
 conf/readme.txt                   |   4 +-
 src/common/HPM.c                  |  49 ++++-
 src/common/HPM.h                  |   5 +-
 src/map/atcommand.c               |   2 +-
 src/map/battle.c                  | 156 +++++++++------
 src/map/battle.h                  |   9 +-
 src/map/map.c                     |   7 +-
 tools/configconverter.pl          | 403 ++++++++++++++++++++++++++++++++++++++
 47 files changed, 2912 insertions(+), 1968 deletions(-)
 delete mode 100644 conf/battle.conf
 delete mode 100644 conf/battle/battle.conf
 delete mode 100644 conf/battle/battleground.conf
 delete mode 100644 conf/battle/client.conf
 delete mode 100644 conf/battle/drops.conf
 delete mode 100644 conf/battle/exp.conf
 delete mode 100644 conf/battle/feature.conf
 delete mode 100644 conf/battle/gm.conf
 delete mode 100644 conf/battle/guild.conf
 delete mode 100644 conf/battle/homunc.conf
 delete mode 100644 conf/battle/items.conf
 delete mode 100644 conf/battle/misc.conf
 delete mode 100644 conf/battle/monster.conf
 delete mode 100644 conf/battle/party.conf
 delete mode 100644 conf/battle/pet.conf
 delete mode 100644 conf/battle/player.conf
 delete mode 100644 conf/battle/skill.conf
 delete mode 100644 conf/battle/status.conf
 create mode 100644 conf/import-tmpl/battle.conf
 delete mode 100644 conf/import-tmpl/battle_conf.txt
 create mode 100644 conf/map/battle.conf
 create mode 100644 conf/map/battle/battle.conf
 create mode 100644 conf/map/battle/battleground.conf
 create mode 100644 conf/map/battle/client.conf
 create mode 100644 conf/map/battle/drops.conf
 create mode 100644 conf/map/battle/exp.conf
 create mode 100644 conf/map/battle/feature.conf
 create mode 100644 conf/map/battle/gm.conf
 create mode 100644 conf/map/battle/guild.conf
 create mode 100644 conf/map/battle/homunc.conf
 create mode 100644 conf/map/battle/items.conf
 create mode 100644 conf/map/battle/misc.conf
 create mode 100644 conf/map/battle/monster.conf
 create mode 100644 conf/map/battle/party.conf
 create mode 100644 conf/map/battle/pet.conf
 create mode 100644 conf/map/battle/player.conf
 create mode 100644 conf/map/battle/skill.conf
 create mode 100644 conf/map/battle/status.conf

(limited to 'src/map')

diff --git a/.gitignore b/.gitignore
index ce3a5c14f..8957156d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,7 +60,6 @@ Thumbs.db
 
 # /conf/
 /conf/import/*.conf
-/conf/import/battle_conf.txt
 /conf/import/msg_conf.txt
 
 # /log/
diff --git a/conf/battle.conf b/conf/battle.conf
deleted file mode 100644
index 1eddfae35..000000000
--- a/conf/battle.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-// Splitted up into multiple files by Skotlex.
-//--------------------------------------------------------------
-
-//General battle-related settings.
-import: conf/battle/battle.conf
-
-//Settings specific to the client.
-import: conf/battle/client.conf
-
-//General drop-related configs.
-import: conf/battle/drops.conf
-
-//Experience rates, exp penalties, stats and max level settings.
-import: conf/battle/exp.conf
-
-//GM levels, atcommands and hack-related configs.
-import: conf/battle/gm.conf
-
-//Guild and WoE settings
-import: conf/battle/guild.conf
-
-//Battleground settings
-import: conf/battle/battleground.conf
-
-//Item/card-specific and crafting related options.
-import: conf/battle/items.conf
-
-//Mob related configuration
-import: conf/battle/monster.conf
-
-//Party related configuration
-import: conf/battle/party.conf
-
-//Pet related configuration
-import: conf/battle/pet.conf
-
-//Homunc related configuration
-import: conf/battle/homunc.conf
-
-//Player specific settings
-import: conf/battle/player.conf
-
-//Skill related settings
-import: conf/battle/skill.conf
-
-//Status change related settings
-import: conf/battle/status.conf
-
-//Feature control (on/off) settings
-import: conf/battle/feature.conf
-
-// Anything else that didn't fit anywhere else.
-// Includes duel, day/night, mute/manner, log settings.
-import: conf/battle/misc.conf
-
-//Your custom config goes here.
-import: conf/import/battle_conf.txt
diff --git a/conf/battle/battle.conf b/conf/battle/battle.conf
deleted file mode 100644
index 8c9447ccb..000000000
--- a/conf/battle/battle.conf
+++ /dev/null
@@ -1,157 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary)
-//--------------------------------------------------------------
-
-// Who should have a baseatk value (makes str affect damage)? (Note 3)
-enable_baseatk: 9
-
-// Who can have perfect flee? (Note 3)
-enable_perfect_flee: 1
-
-// Who can have critical attacks? (Note 3)
-// (Note that there are some skills that always do critical hit regardless of this)
-enable_critical: 17
-
-// Critical adjustment rate for non-players (Note 2)
-mob_critical_rate: 100
-critical_rate: 100
-
-// Should normal attacks give you a walk delay? (Note 3)
-// If no, characters can move as soon as they start an attack (attack animation
-// or walk animation may be omitted client-side, causing cropped attacks or
-// monsters that teleport to you)
-// Otherwise, the delay is equal to the 'attack animation' (amotion)
-attack_walk_delay: 15
-
-// Move-delay adjustment after being hit. (Note 2)
-// The 'can't walk' delay after being hit is calculated as a percentage of the damage animation duration.
-// NOTE: Only affects the normal delay from a single attack, not the delay added by the multihit_delay option below.
-pc_damage_walk_delay_rate: 20
-damage_walk_delay_rate: 100
-
-// Move-delay adjustment for multi-hitting attacks.
-// When hit by a multi-hitting skill like Lord of Vermillion or Jupitel Thunder, characters will be
-// unable to move for an additional "(number of hits -1) * multihit_delay" milliseconds.
-// 80 is the setting that feels like Aegis (vs Sonic Blows)
-// 230 is the setting that makes walkdelay last until the last hit (vs Jupitel thunder)
-multihit_delay: 80
-
-// Damaged delay rate for players (Note 2)
-// (Setting to no/0  will be like always endure)
-player_damage_delay_rate: 100
-
-// Should race or element be used to consider someone undead?
-// 0 = element undead
-// 1 = race undead
-// 2 = both (either one works)
-undead_detect_type: 0
-
-// Does HP recover if hit by an attribute that's same as your own? (Note 1)
-// (Will not work in Renewal)
-attribute_recover: no
-
-// What is the minimum and maximum hitrate of normal attacks?
-min_hitrate: 5
-max_hitrate: 100
-
-// Type of penalty that is applied to FLEE when more than agi_penalty_count monsters are targetting player
-// 0 = no penalty is applied
-// 1 = agi_penalty_num is reduced from FLEE as a %
-// 2 = agi_penalty_num is reduced from FLEE as an exact amount
-agi_penalty_type: 1
-
-// When agi penalty is enabled, to whom it should apply to? (Note 3)
-// By default, only players get the penalty.
-agi_penalty_target: 1
-
-// Amount of enemies required to be targetting player before FLEE begins to be penalized
-agi_penalty_count: 3
-
-// Amount of FLEE penalized per each attacking monster more than agi_penalty_count
-agi_penalty_num: 10
-
-// Type of penalty that is applied to both equipment and vit DEF when more than vit_penalty_count monsters are targetting player
-// 0 = no penalty is applied
-// 1 = vit_penalty_num is reduced from DEF as a %
-// 2 = vit_penalty_num is reduced from DEF as an exact amount
-vit_penalty_type: 1
-
-// When vit penalty is enabled, to whom it should apply to? (Note 3)
-// By default, only players get the penalty.
-vit_penalty_target: 1
-
-// Amount of enemies required to be targetting player before defense begins to be penalized
-vit_penalty_count: 3
-
-// Amount of VIT defense penalized per each attacking monster more than vit_penalty_count
-vit_penalty_num: 5
-
-// Use alternate method of DEF calculation for physical attacks.
-// With 0, disabled (use normal def% reduction with further def2 reduction)
-// At 1 or more defense is subtraction of (DEF* value).
-// eg: 10 + 50 def becomes 0 + (10*type + 50)
-weapon_defense_type: 0
-
-// MDEF, same as above....(MDEF*value)
-magic_defense_type: 0
-
-// Change attacker's direction to face opponent on every attack? (Note 3)
-// NOTE: On official servers knockback of some skills like Firewall is always based on the
-// last direction walked. Even when attacking in a completely different direction, the
-// knockback direction won't change, so e.g. if you walk north and then attack an enemy to
-// the south you will still be knocked back to the south by Firewall. Immobile monsters
-// will always be knocked back to the south as their default direction is north.
-attack_direction_change: 0
-
-// For those who is set, their innate attack element is "not elemental"
-// (100% versus on all defense-elements) (Note 3)
-// NOTE: This is the setting that makes it so non-players can hit for full
-// damage against Ghost-type targets with normal attacks (eg: vs. Ghostring).
-attack_attr_none: 14
-
-// Rate at which equipment can break (base rate before it's modified by any skills)
-// 1 = 0.01% chance. Default for official servers: 0
-equip_natural_break_rate: 0
-
-// Overall rate of which your own equipment can break. (Note 2)
-// This rate affects penalty breaking rate of skills such as power-thrust and your natural breaking rate
-// (from equip_natural_break_rate). If a Sage's endow skill fails and this is above 0, the selected char's
-// weapon will be broken.
-equip_self_break_rate: 100
-
-// Overall rate at which you can break target's equipment. (Note 2)
-// This affects the behaviour of skills like acid terror and meltdown
-equip_skill_break_rate: 100
-
-// Do weapon attacks have a attack speed delay before actual damage is applied? (Note 1)
-// NOTE: The official setting is yes, even thought it degrades performance a bit.
-delay_battle_damage: yes
-
-// Are arrows/ammo consumed when used on a bow/gun?
-// 0 = No
-// 1 = Yes
-// 2 = Yes even for skills that do not specify arrow consumption when said
-//     skill is weapon-based and used with ranged weapons (auto-guesses which
-//     skills should consume ammo when it's acquired via a card or plagiarize)
-arrow_decrement: 1
-
-// Should the item script bonus 'Autospell' check for range/obstacles before casting?
-// Official behavior is "no", setting this to "yes" will make skills use their defined
-// range. For example, Sonic Blow requires a 2 cell distance before autocasting is allowed.
-// This setting also affects autospellwhenhit.
-autospell_check_range: no
-
-// If both the attacker and the target are on the same tile, should the target be knocked back to the left?
-// Official behavior is "yes", setting this to "no" will knock the target back behind the attacker.
-knockback_left: yes
-
-// Should the target be able of dodging damage by snapping away to the edge of the screen?
-// Official behavior is "no"
-snap_dodge: no
diff --git a/conf/battle/battleground.conf b/conf/battle/battleground.conf
deleted file mode 100644
index b4c0b2fbd..000000000
--- a/conf/battle/battleground.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-//--------------------------------------------------------------
-
-// Flee penalty on BG grounds.
-// NOTE: It's %, not absolute, so 20 is -20% of your total flee
-bg_flee_penalty: 20
-
-// Interval before updating the bg-member map mini-dots (milliseconds)
-bg_update_interval: 1000
diff --git a/conf/battle/client.conf b/conf/battle/client.conf
deleted file mode 100644
index 6ca2f67e0..000000000
--- a/conf/battle/client.conf
+++ /dev/null
@@ -1,135 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary)
-//--------------------------------------------------------------
-
-// Whether to enable the official packet obfuscation support (good vs WPE)
-// 0: disabled
-// 1: optional (not recommended) -- identifies whether it is required
-// 2: enabled (recommended)
-packet_obfuscation: 1
-
-// Minimum delay between whisper/global/party/guild messages (in ms)
-// Messages that break this threshold are silently omitted.
-min_chat_delay: 0
-
-// Valid range of dyes and styles on the client.
-min_hair_style: 0
-max_hair_style: 29
-min_hair_color: 0
-max_hair_color: 8
-min_cloth_color: 0
-max_cloth_color: 4
-min_body_style: 0
-max_body_style: 4
-
-// When set to yes, the damage field in packets sent from woe maps will be set
-// to -1, making it impossible for GMs, Bots and Hexed clients to know the
-// actual damage caused by attacks. (Note 1)
-hide_woe_damage: yes
-
-// "hair style" number that identifies pet.
-// NOTE: The client uses the "hair style" field in the mob packet to tell them apart from mobs.
-// This value is always higher than the max hair-style available in said client.
-// Known values to work (all 2005 clients):
-// older sakexes: 20
-// sakexe 0614: 24
-// sakexe 0628 (and later): 100
-pet_hair_style: 100
-
-// Visible area size (how many squares away from a player can they see)
-area_size: 14
-
-// Maximum walk path (how many cells a player can walk going to cursor)
-// default: 17(official)
-max_walk_path: 17
-
-// Maximum allowed 'level' value that can be sent in unit packets.
-// Use together with the aura_lv setting to tell when exactly to show the aura.
-// NOTE: You also need to adjust the client if you want this to work.
-// NOTE: Default is 99. Values above 127 will probably behave incorrectly.
-// NOTE: If you don't know what this does, don't change it!!!
-max_lv: 99
-
-// Level required to display an aura.
-// NOTE: This assumes that sending max_lv to the client will display the aura.
-// NOTE: aura_lv must not be less than max_lv.
-// Example: If max_lv is 99 and aura_lv is 150, characters with level 99~149
-//          will be sent as being all level 98, and only characters with level
-//          150 or more will be reported as having level 99 and show an aura.
-aura_lv: 99
-
-// Units types affected by max_lv and aura_lv settings. (Note 3)
-// Note: If an unit type, which normally does not show an aura, is
-//       set it will obtain an aura when it meets the level requirement.
-// Default: 0 (none)
-client_limit_unit_lv: 0
-
-// Will tuxedo and wedding dresses be shown when worn? (Note 1)
-wedding_modifydisplay: no
-
-// Save Clothes color. (This will degrade performance) (Note 1)
-save_clothcolor: yes
-
-// Save body styles? (Note 1)
-// Note: Don't turn this on unless you know what your doing.
-//       Sprites are not released officially.
-save_body_style: no
-
-// Do not display cloth colors for the wedding costume?
-// Note: Both save_clothcolor and wedding_modifydisplay have to be enabled
-// for this option to take effect. Set this to yes if your cloth palettes
-// pack doesn't has wedding palettes (or has less than the other jobs)
-wedding_ignorepalette: no
-
-// Do not display cloth colors for the Xmas costume?
-// Set this to yes if your cloth palettes pack doesn't has Xmas palettes (or has less than the other jobs)
-xmas_ignorepalette: no
-
-// Do not display cloth colors for the Summer costume?
-// Set this to yes if your cloth palettes pack doesn't has Summer palettes (or has less than the other jobs)
-summer_ignorepalette: no
-
-// Do not display cloth colors for the Hanbok costume?
-// Set this to yes if your cloth palettes pack doesn't has Hanbok palettes (or has less than the other jobs)
-hanbok_ignorepalette: no
-
-// Show Hercules version to users when the login?
-display_version: no
-
-// When affected with the "Hallucination" status effect, send the effect to client? (Note 1)
-// Note: Set to 'no' if the client lags due to the "Wavy" screen effect.
-display_hallucination: yes
-
-// Set this to 1 if your client supports status change timers and you want to use them
-// Clients from 2009 onward support this
-display_status_timers: yes
-
-// Randomizes the dice emoticon server-side, to prevent clients from forging
-// packets for the desired number. (Note 1)
-client_reshuffle_dice: yes
-
-// Sorts the character and guild storage before it is sent to the client.
-// Official servers do not sort storage. (Note 1)
-// NOTE: Enabling this option degrades performance.
-client_sort_storage: no
-
-// Duration of client's self mute in minutes.
-// Note: Do not enable this, if you enabled commands for players,
-// because the client sees multiple commands in succession as spam.
-// Default: 0 (means disabled)
-client_accept_chatdori: 0
-
-// Limits use of blank (transparent) pixels in guild emblems to a set
-// percentage of the total.
-// Official servers do not enforce this technically to date, but some disallow
-// use of blank emblems in their rules. (Note 2)
-// A value of 100 (allowing 100% blank pixels) disables this check.
-// NOTE: Enabling this option slightly degrades performance.
-client_emblem_max_blank_percent: 100
diff --git a/conf/battle/drops.conf b/conf/battle/drops.conf
deleted file mode 100644
index ec122002a..000000000
--- a/conf/battle/drops.conf
+++ /dev/null
@@ -1,134 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-//--------------------------------------------------------------
-
-// If an item is dropped, does it go straight into the users inventory? (Note 1)
-item_auto_get: no
-
-// How long does it take for an item to disappear from the floor after it is dropped? (in milliseconds)
-flooritem_lifetime: 60000
-
-// Grace time during which only the person who did the most damage to a monster can get the item? (in milliseconds)
-item_first_get_time: 3000
-
-// Grace time during which only the first and second person who did the most damage to a monster can get the item? (in milliseconds)
-// (Takes effect after item_first_get_time elapses)
-item_second_get_time: 1000
-
-// Grace time during which only the first, second and third person who did the most damage to a monster can get the item? (in milliseconds)
-// (Takes effect after the item_second_get_time elapses)
-item_third_get_time: 1000
-
-// Grace time to apply to MvP reward items when the Most Valuable Player can't get the prize item and it drops on the ground? (in milliseconds)
-mvp_item_first_get_time: 10000
-
-// Grace time for the first and second MvP so they can get the item? (in milliseconds)
-// (Takes effect after mvp_item_first_get_time elapses)
-mvp_item_second_get_time: 10000
-
-// Grace time for the first, second and third MvP so they can get the item? (in milliseconds)
-// (Takes effect after mvp_item_second_get_time elapses)
-mvp_item_third_get_time: 2000
-
-// Item drop rates (Note 2)
-
-// The rate the common items are dropped (Items that are in the ETC tab, besides card)
-item_rate_common: 100
-item_rate_common_boss: 100
-item_drop_common_min: 1
-item_drop_common_max: 10000
-
-// The rate healing items are dropped (items that restore HP or SP)
-item_rate_heal: 100
-item_rate_heal_boss: 100
-item_drop_heal_min: 1
-item_drop_heal_max: 10000
-
-// The rate at which usable items (in the item tab) other then healing items are dropped.
-item_rate_use: 100
-item_rate_use_boss: 100
-item_drop_use_min: 1
-item_drop_use_max: 10000
-
-// The rate at which equipment is dropped.
-item_rate_equip: 100
-item_rate_equip_boss: 100
-item_drop_equip_min: 1
-item_drop_equip_max: 10000
-
-// The rate at which cards are dropped
-item_rate_card: 100
-item_rate_card_boss: 100
-item_drop_card_min: 1
-item_drop_card_max: 10000
-
-// The rate adjustment for the MVP items that the MVP gets directly in their inventory
-item_rate_mvp: 100
-item_drop_mvp_min: 1
-item_drop_mvp_max: 10000
-
-// The rate adjustment for card-granted item drops.
-item_rate_adddrop: 100
-item_drop_add_min: 1
-item_drop_add_max: 10000
-
-// Rate adjustment for Treasure Box drops (these override all other modifiers)
-item_rate_treasure: 100
-item_drop_treasure_min: 1
-item_drop_treasure_max: 10000
-
-// Use logarithmic drops? (Note 1)
-// Logarithmic drops scale drop rates in a non-linear fashion using the equation
-// Droprate(x,y) = x * (5 - log(x)) ^ (ln(y) / ln(5))
-// Where x is the original drop rate and y is the drop_rate modifier (the previously mentioned item_rate* variables)
-// Use the following table for an idea of how the rate will affect drop rates when logarithmic drops are used:
-// Y: Original Drop Rate
-// X: Rate drop modifier (eg: item_rate_equip)
-//  X\Y | 0.01 0.02  0.05  0.10  0.20  0.50  1.00  2.00  5.00 10.00 20.00
-// -----+---------------------------------------------------------------
-//   50 | 0.01 0.01  0.03  0.06  0.11  0.30  0.62  1.30  3.49  7.42 15.92
-//  100 | 0.01 0.02  0.05  0.10  0.20  0.50  1.00  2.00  5.00 10.00 20.00
-//  200 | 0.02 0.04  0.09  0.18  0.35  0.84  1.61  3.07  7.16 13.48 25.13
-//  500 | 0.05 0.09  0.22  0.40  0.74  1.65  3.00  5.40 11.51 20.00 33.98
-// 1000 | 0.10 0.18  0.40  0.73  1.30  2.76  4.82  8.28 16.47 26.96 42.69
-// 2000 | 0.20 0.36  0.76  1.32  2.28  4.62  7.73 12.70 23.58 36.33 53.64
-// 5000 | 0.50 0.86  1.73  2.91  4.81  9.11 14.45 22.34 37.90 53.91 72.53
-//10000 | 1.00 1.67  3.25  5.28  8.44 15.24 23.19 34.26 54.57 72.67 91.13
-//20000 | 2.00 3.26  6.09  9.59 14.83 25.49 37.21 52.55 77.70 97.95  100%
-//50000 | 5.00 7.87 13.98 21.12 31.23 50.31 69.56 92.48  100%  100%  100%
-item_logarithmic_drops: no
-
-// Can the monster's drop rate become 0? (Note 1)
-// Default: no (as in official servers).
-drop_rate0item: no
-
-// Makes your LUK value affect drop rates on an absolute basis.
-// Setting to 100 means each luk adds 0.01% chance to find items
-// (regardless of item's base drop rate).
-drops_by_luk: 0
-
-// Makes your LUK value affect drop rates on a relative basis.
-// Setting to 100 means each luk adds 1% chance to find items
-// (So at 100 luk, everything will have double chance of dropping).
-drops_by_luk2: 0
-
-// Whether or not Marine Spheres and Floras summoned by Alchemist drop items?
-// This setting has three available values:
-// 0: Nothing drops.
-// 1: Only marine spheres drop items.
-// 2: All alchemist summons drop items.
-alchemist_summon_reward: 1
-
-// Make broadcast ** Player1 won Pupa's Pupa Card (chance 0.01%) ***
-// This can be set to any value between 0~10000.
-// Note: It also announces STEAL skill usage with rare items
-// 0 = don't show announces at all
-// 1 = show announces for 0.01% drop chance items
-// 333 = show announces for 3.33% or lower drop chance items
-// 10000 = show announces for all items
-rare_drop_announce: 0
diff --git a/conf/battle/exp.conf b/conf/battle/exp.conf
deleted file mode 100644
index 88c5d9c7a..000000000
--- a/conf/battle/exp.conf
+++ /dev/null
@@ -1,91 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-// Note 3: The max level of classes is stored in the exp table.
-//         See files db/exp.txt and db/exp2.txt to change them.
-//--------------------------------------------------------------
-
-// Rate at which exp. is given. (Note 2)
-base_exp_rate: 100
-
-// Rate at which job exp. is given. (Note 2)
-job_exp_rate: 100
-
-// Turn this on to allow a player to level up more than once from a kill. (Note 1)
-multi_level_up: no
-
-// Setting this can cap the max experience one can get per kill specified as a
-// % of the current exp bar. (Every 10 = 1.0%)
-// For example, set it to 500 and no matter how much exp the mob gives,
-// it can never give you above half of your current exp bar.
-max_exp_gain_rate: 0
-
-// Method of calculating earned experience when defeating a monster:
-// 0 = uses damage given / total damage as damage ratio
-// 1 = uses damage given / max_hp as damage ratio
-// NOTE: Using type 1 disables the bonus where the first attacker gets
-//       his share of the exp doubled when multiple people attack the mob.
-exp_calc_type: 0
-
-// Experience increase per attacker. That is, every additional attacker to the
-// monster makes it give this much more experience
-// (eg: 5 people attack with 25 here, +(25*4)% -> +100% exp)
-exp_bonus_attacker: 25
-
-// Max number of attackers at which exp bonus is capped
-// (eg: if set at 5, the max bonus is 4*bonus-per-char regardless of attackers)
-exp_bonus_max_attacker: 12
-
-// MVP bonus exp rate. (Note 2)
-mvp_exp_rate: 100
-
-// Rate of base/job exp given by NPCs. (Note 2)
-quest_exp_rate: 100
-
-// The rate of job exp. from using Heal skill (100 is the same as the heal amount, 200 is double.
-// The balance of the exp. rate is best used with 5 to 10)
-heal_exp: 0
-
-// The rate of exp. that is gained by the process of resurrection, a unit is 0.01%.
-// Experience calculations for the experience value * level difference of the person revived / 100 * resurrection_exp/10000 which the revived player has can be got.
-resurrection_exp: 0
-
-// The rate of job exp. when using discount and overcharge on an NPC
-// (in 0.01% increments - 100 is 1%, 10000 is normal, 20000 is double.)
-// The way it is calculated is (money received * skill lv) * shop_exp / 10000.
-shop_exp: 0
-
-// PVP exp.  Do players get exp in PvP maps
-// (Note: NOT exp from players, but from normal leveling)
-pvp_exp: yes
-
-// When a player dies, how should we penalize them?
-// 0 = No penalty.
-// 1 = Lose % of current level when killed.
-// 2 = Lose % of total experience when killed.
-death_penalty_type: 1
-
-// Base exp. penalty rate (Each 100 is 1% of their exp)
-death_penalty_base: 100
-
-// Job exp. penalty rate (Each 100 is 1% of their exp)
-death_penalty_job: 100
-
-// When a player dies (to another player), how much zeny should we penalize them with?
-// NOTE: It is a percentage of their zeny, so 100 = 1%
-zeny_penalty: 0
-
-// Will display experience gained from killing a monster. (Note 1)
-disp_experience: no
-
-// Will display zeny earned (from mobs, trades, etc) (Note 1)
-disp_zeny: no
-
-// Use the contents of db/statpoint.txt when doing a stats reset and leveling up? (Note 1)
-// If no, an equation will be used which preserves statpoints earned/lost
-// through external means (ie: stat point buyers/sellers)
-use_statpoint_table: yes
diff --git a/conf/battle/feature.conf b/conf/battle/feature.conf
deleted file mode 100644
index 000bc318b..000000000
--- a/conf/battle/feature.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Feature Configuration File
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-//--------------------------------------------------------------
-
-// Buying store (Note 1)
-// Requires: 2010-04-27aRagexeRE or later
-feature.buying_store: on
-
-// Search stores (Note 1)
-// Requires: 2010-08-03aRagexeRE or later
-feature.search_stores: on
-
-// Atcommand suggestions (Note 1)
-// If one type incomplete atcommand, it will suggest the complete ones.
-feature.atcommand_suggestions: off
-
-// Banking (Note 1)
-// Requires: 2013-07-24aRagexe or later
-feature.banking: on
-
-// Auction (Note 1)
-// Feature became unstable on clients 2012 onwards (exact date not known),
-// it has been fixed on clients 2013-05-15 onwards however.
-feature.auction: off
-
-// Roulette (Note 1)
-// Requires: 2014-10-22bRagexe or later
-// Off by default while test version is out; enable at your own risk -- the mean dev.
-feature.roulette: off
diff --git a/conf/battle/gm.conf b/conf/battle/gm.conf
deleted file mode 100644
index dc70bc6ca..000000000
--- a/conf/battle/gm.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-//--------------------------------------------------------------
-
-// The maximum quantity of monsters that can be summoned per GM command (0 denotes an unlimited quantity)
-atcommand_spawn_quantity_limit: 100
-
-// Maximum number of slave-clones that can be have by using the @slaveclone at command. (0 denotes unlimited quantity)
-atcommand_slave_clone_limit: 25
-
-// If 'no', commands require exact player name. If 'yes', entering a partial
-// name will work, as long as there's only one match from all players in the
-// current map server.
-partial_name_scan: yes
-
-// (@) @allstats/@str/@agi/@vit/@int/@dex/@luk
-// allow gms to bypass the maximum stat parameter? ( if yes gm stats can go up to 32k ) default: no
-atcommand_max_stat_bypass: no
-
-// Ban people that try trade dupe.
-// Duration of the ban, in minutes (default: 5). To disable the ban, set 0.
-ban_hack_trade: 5
-
-// requires RENEWAL_DROP to be enabled (src/map/config/renewal.h)
-// modifies @mobinfo to display the users' real drop rate as per renewal_drop formula
-// modifies @iteminfo to not display the minimum item drop rate (since it can't tell the mob level)
-atcommand_mobinfo_type: 0
-
-// Ignore warpable area configuration.
-// Set the minimum group id to ignore invalid cells when warping.
-// Default group is 2. Use 100 to disable this setting.
-gm_ignore_warpable_area: 2
-
-// Should atcommands trigger level up events for NPCs? (Note 1)
-// This option is for @baselevelup and @joblevelup
-// Default: no
-atcommand_levelup_events: no
diff --git a/conf/battle/guild.conf b/conf/battle/guild.conf
deleted file mode 100644
index 59fc78c51..000000000
--- a/conf/battle/guild.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-//--------------------------------------------------------------
-
-// When making a guild, an Emperium is consumed? (Note 1)
-guild_emperium_check: yes
-
-// Maximum tax limit on a guild member.
-guild_exp_limit: 50
-
-// Maximum castles one guild can own (0 = unlimited)
-guild_max_castles: 0
-
-// Restart guild skills cooldown by relog? (Note 1)
-// When "no", you relog with the same cooldown remaining as from when you
-// logged out, "yes" restarts the cooldown upon login to its full duration.
-guild_skill_relog_delay: no
-
-// Damage adjustments for WOE battles against defending Guild monsters (Note 2)
-castle_defense_rate: 100
-
-// Flee penalty on gvg grounds. Official value is 20 (Note 2)
-// NOTE: It's %, not absolute, so 20 is -20% of your total flee
-gvg_flee_penalty: 20
-
-// Can the 'Glory of Guild' skill be learnt in the Guild window,
-// and does changing emblems require it? (Note 1)
-// P.S: This skill is not implemented on official servers
-require_glory_guild: no
-
-// Limit Guild alliances. Value is 0 to 3.
-// If you want to change this value, clear the guild alliance table.
-// Default is 3
-max_guild_alliance: 3
-
-// When to re-display the guild notice
-// Upon teleporting (regardless of changing maps): 2 (official)
-// Upon changing maps: 1
-// Do not re-display: 0 (disabled)
-guild_notice_changemap: 2
-
-// Can guild members invite/expel members inside guild castles in WoE/GvG? (Note 1)
-// default: no
-guild_castle_invite: no
-guild_castle_expulsion: no
diff --git a/conf/battle/homunc.conf b/conf/battle/homunc.conf
deleted file mode 100644
index a33eab8ea..000000000
--- a/conf/battle/homunc.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-//--------------------------------------------------------------
-
-// Homunculus setting (Note 3)
-// Activates various 'quirks' that makes them behave unlike normal characters.
-// 0x001: Can't be targetted by support skills (except for their master)
-// 0x004: Mobs will always go after them instead of players until attacked
-// 0x008: Copy their master's speed on spawn/map-change
-// 0x010: They display luk/3+1 instead of their actual critical in the
-//        stat window (by default they don't crit)
-// 0x020: Their Min-Matk is always the same as their max
-// 0x040: Skill re-use delay is reset when they are vaporized.
-hom_setting: 0x1D
-
-// The rate a homunculus will get friendly by feeding it. (Note 2)
-homunculus_friendly_rate: 100
-
-// Can you name a homunculus more then once? (Note 1)
-hom_rename: no
-
-// Intimacy needed to use Evolved Vanilmirth's Bio Explosion
-hvan_explosion_intimate: 45000
-
-// Show stat growth to the owner when an Homunculus levels up
-homunculus_show_growth: yes
-
-// Does autoloot work, when a monster is killed by homunculus only?
-homunculus_autoloot: yes
-
-// Should homunculi Vaporize when Master dies?
-homunculus_auto_vapor: yes
-
-// Max level for regular Homunculus
-homunculus_max_level: 99
-
-// Max level for Homunculus S
-homunculus_S_max_level: 150
diff --git a/conf/battle/items.conf b/conf/battle/items.conf
deleted file mode 100644
index e2358b6d6..000000000
--- a/conf/battle/items.conf
+++ /dev/null
@@ -1,95 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-//--------------------------------------------------------------
-
-// The highest value at which an item can be sold via the merchant vend skill. (in zeny)
-vending_max_value: 1000000000
-
-// Whether to allow buying from vending chars that are at their max. zeny limit.
-// If set to yes, the rest of the zeny above the char's capacity will disappear.
-vending_over_max: yes
-
-// Tax to apply to all vending transactions (eg: 10000 = 100%, 50 = 0.50%)
-// When a tax is applied, the item's full price is charged to the buyer, but
-// the vender will not get the whole price paid (they get 100% - this tax).
-vending_tax: 200
-
-// Show the buyer's name when successfully vended an item
-buyer_name: yes
-
-// Forging success rate. (Note 2)
-weapon_produce_rate: 100
-
-// Prepare Potion success rate. (Note 2)
-potion_produce_rate: 100
-
-// Do produced items have the maker's name on them? (Note 3)
-// 0x01: Produced Weapons
-// 0x02: Produced Potions
-// 0x04: Produced Arrows
-// 0x08: Produced Holy Water/Ancilla
-// 0x10: Produced Deadly Potions
-// 0x80: Other produced items.
-produce_item_name_input: 0x03
-
-// Is a monster summoned via dead branch aggressive? (Note 1)
-dead_branch_active: yes
-
-// Should summoned monsters check the player's base level? (dead branches) (Note 1)
-// On officials this is no - monsters summoned from dead/bloody branches can be ANY level.
-// Change to 'yes' to only summon monsters less than or equal to the player's base level.
-random_monster_checklv: no
-
-// Can any player equip any item regardless of the gender restrictions
-// NOTE: Wedding Rings and Whips/Musical Instruments will check gender regardless of setting.
-ignore_items_gender: yes
-
-// Item check? (Note 1)
-// On map change it will check for items not tagged as "available" and
-// auto-delete them from inventory/cart.
-// NOTE: An item is not available if it was not loaded from the item_db or you
-// specify it as unavailable in db/item_avail.txt
-item_check: no
-
-// How much time must pass between item uses?
-// Only affects the delay between using items, prevents healing item abuse. Recommended ~500 ms
-// On officials this is 0, but it's set to 100ms as a measure against bots/macros.
-item_use_interval: 100
-
-// How much time must pass between cash food uses? Default: 60000 (1 min)
-cashfood_use_interval: 60000
-
-// Required level of bNoMagicDamage before Status Changes are blocked (Golden Thief Bug card).
-// For example, if left at 50. An item can give bNoMagicDamage,40;
-// which reduces magic damage by 40%, but does not blocks status changes.
-gtb_sc_immunity: 50
-
-// Enable autospell card effects to stack?
-// NOTE: Different cards that grant the same skill will both
-// always work independently of each other regardless of setting.
-autospell_stacking: no
-
-// Will disabled consumables (disabled by map_zone_db.conf) be consumed when trying to use them?
-// 1 (official): yes
-// 0: no
-item_restricted_consumption_type: 1
-
-// Enable all NPC to allow changing of equipments while interacting? (Note 1)
-// Script commands 'enable_items/disable_items' will not be override. (see doc/script_commands.txt)
-// 1 : yes(official)
-// 0 : no
-item_enabled_npc: 1
-
-// Unequip the equipments that has disabled by map_zone_db.conf ?
-// 0 : disabled equipments and cards are nullify (official)
-// 1 : disabled equipments are unequip, disabled cards are nullify
-// 2 : disabled equipments are nullify, disabled cards will caused the equipment to unequip
-// 3 : disabled equipments are unequip, disabled cards will caused the equipment to unequip (1+2)
-unequip_restricted_equipment: 0
diff --git a/conf/battle/misc.conf b/conf/battle/misc.conf
deleted file mode 100644
index a3c6ed26a..000000000
--- a/conf/battle/misc.conf
+++ /dev/null
@@ -1,150 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-//--------------------------------------------------------------
-
-// PK Server Mode.
-//   Turns entire server pvp(excluding towns).
-//   Experience loss is doubled if killed by another player.
-//   When players hunt monsters over 20 levels higher, they will receive 15%
-//   additional exp., and 25% chance of receiving more items.
-//   There is a nopvp.txt for setting up maps not to have pk on in this mode.
-//   Novices cannot be attacked and cannot attack.
-//   Normal pvp counter and rank display are disabled as well.
-// Note: If pk_mode is set to 2 instead of 1 (yes), players will receive a
-//   manner penalty of 5 each time they kill another player (see manner_system
-//   config to adjust how this will affect players)
-pk_mode: 0
-
-// Manner/karma system configuration. Specifies how does negative manner
-// (red no chat bubble) affects players (add as needed):
-//  0: No penalties.
-//  1: Disables chatting (includes whispers, party/guild msgs, etc)
-//  2: Disables skill usage
-//  4: Disables commands usage
-//  8: Disables item usage/picking/dropping
-// 16: Disables room creation (chatrooms and vending shops)
-manner_system: 31
-
-// For PK Server Mode. Change this to define the minimum level players can start PK-ing
-pk_min_level: 55
-
-// For PK Server Mode. It specifies the maximum level difference between
-// players to let them attack each other. 0 disables said limit.
-pk_level_range: 0
-
-// Display skill usage in console? (for debug only) (default: off) (Note 3)
-skill_log: off
-
-// Display battle log? (for debug only) (default: off) (Note 1)
-battle_log: off
-
-// Display other stuff? (for debug only) (default: off) (Note 1)
-etc_log: off
-
-// Do you want to debug warp points? If set to yes, warp points will appear as flags.(Note 1)
-// It will also run on start-up a warp-check to print out which warp points lead directly on
-// top of on-touch npcs (which can lead to infinite loopback warping situations)
-warp_point_debug: no
-
-// Choose if server begin with night (yes) or day (no)
-night_at_start: no
-
-// Define duration in msec of the day (default: 7200000 = 2 hours)
-// Set to 0 to disable day cycle (but not @day GM command).
-// Except 0, minimum is 60000 (1 minute)
-day_duration: 0
-
-// Define duration in msec of the night (default: 1800000 = 30 min)
-// Set to 0 to disable night cycle (but not @night GM command).
-// Except 0, minimum is 60000 (1 minute)
-night_duration: 0
-
-// Using duel on pvp-maps
-duel_allow_pvp: no
-
-// Using duel on gvg-maps
-duel_allow_gvg: no
-
-// Allow using teleport/warp when dueling
-duel_allow_teleport: no
-
-// Autoleave duel when die
-duel_autoleave_when_die: yes
-
-// Delay between using @duel in minutes
-duel_time_interval: 60
-
-// Restrict duel usage to same map
-duel_only_on_same_map: no
-
-// Determines max number of characters that can stack within a single cell.
-// Official - Only affects the walking routines of characters, including monsters.
-// If a unit stops walking and is on a cell with more than stack limit
-// characters on it, it will walk to the closest free cell.
-// Custom - This variation will make every full cell to be considered a wall.
-// NOTE: For this setting to take effect you have to use a server compiled
-// with Cell Stack Limit support (see src/map/map.h)
-official_cell_stack_limit: 1
-custom_cell_stack_limit: 1
-
-// If 0 while walking not check occupied cells
-// If 1 while walking check occupied cells
-check_occupied_cells: 1
-
-// Allow autotrade only in map with autotrade flag?
-// Set this to "no" will allow autotrade where no "autotrade" mapflag is set
-// Set this to "yes" to only allow autotrade on maps with "autotrade" mapflag
-at_mapflag: no
-
-// Set this to the amount of minutes autotrade chars will be kicked from the server.
-at_timeout: 0
-
-// Auction system, fee per hour. Default is 12000
-auction_feeperhour: 12000
-
-// Auction maximum sell price
-auction_maximumprice: 500000000
-
-// Minimum delay between each store search query in seconds.
-searchstore_querydelay: 10
-
-// Maximum amount of results a store search query may yield, before
-// it is canceled.
-searchstore_maxresults: 30
-
-// Whether or not gaining and loosing of cash points is displayed (Note 1).
-// Default: no
-cashshop_show_points: no
-
-// Whether or not mail box status is displayed upon login.
-// Default: 0
-// 0 = No
-// 1 = Yes
-// 2 = Yes, when there are unread mails
-mail_show_status: 0
-
-// Is monster transformation disabled during Guild Wars?
-// If set to yes, monster transforming is automatically removed/disabled when entering castles during WoE times
-mon_trans_disable_in_gvg: no
-
-// Whether AegisName and SpriteName lookups are case sensitive
-// Default: yes (as in official servers)
-// When this is set to yes, item and monster lookups through atcommands and
-//   script commands will match AegisNames and SpriteNames only when the case
-//   matches. Display name lookups are not affected by this setting.
-// Example: Given the two items:
-// -  { Id: 553,  AegisName: "Bun",  Name: "Bao" }
-// -  { Id: 6115, AegisName: "Bun_", Name: "Bun" }
-// query       when 'yes'    when 'no'
-// @item bun   # 6115        # 553
-// @item Bun   # 553         # 553
-// @item Bao   # 553         # 553
-// @item Bun_  # 6115        # 6115
-case_sensitive_aegisnames: yes
diff --git a/conf/battle/monster.conf b/conf/battle/monster.conf
deleted file mode 100644
index 23087ec78..000000000
--- a/conf/battle/monster.conf
+++ /dev/null
@@ -1,238 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-//--------------------------------------------------------------
-
-// The HP rate of MVPs. (Note 2)
-mvp_hp_rate: 100
-
-// The HP rate of normal monsters (that is monsters that are not MVP's) (Note 2)
-monster_hp_rate: 100
-
-// The maximum attack speed of a monster
-monster_max_aspd: 199
-
-// Defines various mob AI related settings. (Note 3)
-// 0x001: When enabled mobs will update their target cell every few iterations
-//        (normally they never update their target cell until they reach it while
-//        chasing)
-// 0x002: Makes mob use their "rude attack" skill (usually warping away) if they
-//        are attacked and they can't attack back regardless of how they were
-//        attacked (eg: GrimTooth), otherwise, their rude attack" is only activated
-//        if they can't melee reach the target (eg: sniping)
-// 0x004: If not set, mobs that can change target only do so when melee attacked
-//        (distance player/mob < 3), otherwise mobs may change target and chase
-//        ranged attackers. This flag also overrides the 'provoke' target.
-// 0x008: When set, mobs scatter as soon as they lose their target. Use this mode
-//        to make it much harder to mob-train by hiding and collecting them on a
-//        single spot (ie: GrimTooth training)
-// 0x010: If set, mob skills defined for friends will also trigger on themselves.
-// 0x020: When set, the monster ai is executed for all monsters in maps that
-//        have players on them, instead of only for mobs who are in the vicinity
-//        of players.
-// 0x040: When set, when the mob's target changes map, the mob will walk towards
-//        any npc-warps in it's sight of view (use with mob_warp below)
-// 0x100: When set, a mob will pick a random skill from it's list and start from
-//        that instead of checking skills in orders (when unset, if a mob has too
-//        many skills, the ones near the end will rarely get selected)
-// 0x200: When set, a mob's skill re-use delay will not be applied to all entries of
-//        the same skill, instead, only to that particular entry (eg: Mob has heal
-//        on six lines in the mob_skill_db, only the entry that is actually used
-//        will receive the delay). This will make monsters harder, especially MvPs.
-// 0x400: Set this to make mobs have a range of 9 for all skills. Otherwise, they
-//        will obey the normal skill range rules.
-// Example: 0x140 -> Chase players through warps + use skills in random order.
-monster_ai: 0
-
-// How often should a monster rethink its chase?
-// 0: Every 100ms (MIN_MOBTHINKTIME)
-// 1: Every cell moved
-// 2: Every 2 cells moved
-// 3: Every 3 cells moved (official)
-// x: Every x cells moved
-// Regardless of this setting, a monster will always rethink its chase if it has
-// reached its target. Increase this value if you want to make monsters continue
-// moving after they lost their target (hide, no line of sight, etc.).
-monster_chase_refresh: 3
-
-// Should mobs be able to be warped (add as needed)?
-// 0: Disable.
-// 1: Enable mob-warping when standing on NPC-warps
-// 2: Enable mob-warping when standing on Priest Warp Portals
-// 4: Disable warping when the target map is a 'nobranch' map.
-mob_warp: 0
-
-// If these are set above 0, they define the time (in ms) during which monsters
-// will have their 'AI' active after all players have left their vicinity.
-mob_active_time: 0
-boss_active_time: 0
-
-// Mobs and Pets view-range adjustment (range2 column in the mob_db) (Note 2)
-view_range_rate: 100
-
-// Chase Range is the base minimum-chase that a mob gives before giving up
-// (as long as the target is outside their field of view). This is the range3
-// column in the mob_db. (Note 2)
-chase_range_rate: 100
-
-// Allow monsters to be aggresive and attack first? (Note 1)
-monster_active_enable: yes
-
-// Should the mob_db names override the mob names specified in the spawn files?
-// 0: No
-// 1: always use the mob_db Name column (english mob name)
-// 2: always use the mob_db JName column (original Kro mob name)
-override_mob_names: 0
-
-// Monster damage delay rate (Note 1)
-// Setting to no/0 is like they always have endure.
-monster_damage_delay_rate: 100
-
-// Looting monster actions.
-// 0 = Monster will consume the item.
-// 1 = Monster will not consume the item.
-monster_loot_type: 0
-
-// Chance of mob casting a skill (Note 2)
-// Higher rates lead to 100% mob skill usage with no/few normal attacks.
-// Set to 0 to disable mob skills.
-mob_skill_rate: 100
-
-// Mob skill delay adjust (Note 2)
-// After a mob has casted a skill, there is a delay before being able to
-// re-cast it. Note that skills with a delay of 0 can't be affected by this
-// setting.
-mob_skill_delay: 100
-
-// Rate of monsters on a map, 200 would be twice as many as normal. (Note 2)
-mob_count_rate: 100
-
-// Respawn rate of monsters on a map. 50 would make mobs respawn twice as fast (half delay time) (Note 2)
-//Note: This does not affects mobs with immediate respawn (most normal mobs)
-mob_spawn_delay: 100
-plant_spawn_delay: 100
-boss_spawn_delay: 100
-
-// Should mobs not spawn within the viewing range of players?
-// 0 is disabled, otherwise it is the number of retries before giving up
-// and spawning the mob within player-view anyway, unless the max (100) is used,
-// in which case the mob will not be spawned, and it'll be retried again in
-// 5 seconds.
-// NOTE: This has no effect on mobs that always spawn on the very same cell
-// (like ant eggs) except if you set it to the max.
-no_spawn_on_player: 0
-
-// Should spawn coordinates in the mob-spawn files be ignored? (Note 1)
-// If set to yes, all monsters will have a random respawn spot across the whole
-// map regardless of what the mob-spawn file says.
-force_random_spawn: no
-
-// Do summon slaves inherit the passive/aggressive traits of their master?
-// 0: No, retain original mode.
-// 1: Slaves are always aggressive.
-// 2: Slaves are always passive.
-// 3: Same as master's aggressive/passive state.
-slaves_inherit_mode: 2
-
-// Do summon slaves have the same walking speed as their master?
-// NOTE: The default is 3 for official servers.
-// 0: Never.
-// 1: If the master can walk
-// 2: If the master can't walk (even motionless mobs have a speed
-//    entry in their mob_db)
-// 3: Always
-slaves_inherit_speed: 3
-
-// Will summoned monsters (alchemists, or @summon'ed monsters) attack cause a
-// chance of triggering the master's autospell cards? (Note 1)
-summons_trigger_autospells: yes
-
-// When a mob is attacked by another monster, will the mob retaliate against the master of said mob instead of the mob itself?
-// NOTE: Summoned mobs are both those acquired via @summon and summoned by Alchemists
-retaliate_to_master: yes
-
-// Whether mobs should change target temporarily when a skill triggers a counter mob skill (Note 1)
-// eg: Mob attacks player B, and player A casts a skill C. If set to yes and the
-// mob has a skill that is triggered by skill C, then A will be the target of
-// the skill, otherwise B will be targetted by the reaction skill.
-mob_changetarget_byskill: no
-
-// If monster's class is changed will it fully recover HP? (Note 1)
-monster_class_change_full_recover: yes
-
-// Display some mob info next to their name? (add as needed)
-// (does not works on guardian or Emperium)
-// 1: Display mob HP (Hp/MaxHp format)
-// 2: Display mob HP (Percent of full life format)
-// 4: Display mob's level
-show_mob_info: 0
-
-// Zeny from mobs
-zeny_from_mobs: no
-
-// Monsters level up (monster will level up each time a player is killed and they will grow stronger)
-// Exp rate is calculated ((monster level-original monster level)*(exp*(mobs_level_up_exp rate/100)))
-// NOTE: Does not apply to WoE Guardians.
-mobs_level_up: no
-mobs_level_up_exp_rate: 1
-
-// Dynamic Mobs Options
-// Use dynamic mobs? (recommended for small-medium sized servers)
-dynamic_mobs: yes
-
-// Remove Mobs even if they are hurt
-mob_remove_damaged: yes
-
-// Delay before removing mobs from empty maps (default 5 min = 300 secs)
-mob_remove_delay: 300000
-
-// Defines on who the mob npc_event gets executed when a mob is killed.
-// Type 1: On the player that killed the mob (if killed by a non-player, resorts to type 0)
-// Type 0: On the player that did the most damage to the mob.
-// NOTE: This affects who gains the Castle when the Emperium is broken.
-mob_npc_event_type: 1
-
-// Time in milliseconds to activate protection against Kill Steal
-// Set to 0 to disable it.
-// If this is activated and a player is using @noks, damage from others players (KS) not in the party
-// will be reduced to 0.
-ksprotection: 0
-
-// Should MVP slaves retain their target when summoned back to their master?
-mob_slave_keep_target: yes
-
-// Whether or not to spawn the mvp tomb.
-// See http://irowiki.org/wiki/MVP#Gravestone
-mvp_tomb_enabled: yes
-
-// Show hp bar on monsters? (Default: yes)
-// NOTE: only works on client 2012-04-04aRagexeRE onwards
-show_monster_hp_bar: yes
-
-// Whether or not the size of specially summoned mobs influences experience, drop rates,
-// and stats. The rates will be doubled for large mobs, and halved for small ones.
-// This is only invoked under the 'monster' command, @monsterbig, and @monstersmall. (Note 1)
-// Default: no
-mob_size_influence: no
-
-// How should a monster be trapped by an icewall casted directly on it?
-// On official servers, monsters can only leave an icewall to the west and south. If their target is north or east of
-// them they will continously try to chase it but fail doing so. This brings them into a loop during which they will use
-// idle and chase skills. Boss monsters on the other hand will behave like a trapped monster, do not move and will use
-// idle and rudeattacked skills (when attacked).
-// 0: Monster won't be stuck in icewall at all.
-// 1: Monster will behave like a trapped monster.
-// 2-255: Number of loops a monster will go through the behavior described above before it frees itself from icewall.
-// NOTE: On some servers, normal monsters can free themselves after 15-35 second depending on their speed. On other
-// servers, they will be stuck inside icewall until it expires. Also, many official servers (e.g. iRO) have casting
-// icewall completely blocked on all maps that have boss monsters on them.
-// Default (least exploitable): mob - 75, boss - 0
-// Default (most official): mob - 220, boss - 1
-mob_icewall_walk_block: 220
-boss_icewall_walk_block: 1
diff --git a/conf/battle/party.conf b/conf/battle/party.conf
deleted file mode 100644
index 72a22b94a..000000000
--- a/conf/battle/party.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-//--------------------------------------------------------------
-
-// If someone steals (gank/steal skills), show name in party? (Note 1)
-show_steal_in_same_party: no
-
-// Interval before updating the party-member map mini-dots (milliseconds)
-party_update_interval: 1000
-
-// Method used to update party-mate hp-bars:
-// 0: Aegis - bar is updated every time HP changes (bandwidth intensive)
-// 1: Athena - bar is updated with the party map dots (up to 1 second delay)
-party_hp_mode: 0
-
-// When 'Party Share' item sharing is enabled in a party,
-// announce in the party which party-member received the item and what's he received? (Note 1)
-show_party_share_picker: yes
-
-// What types of items are going to be announced when 'show_party_share_picker' is active?
-// 1:   IT_HEALING,  2:   IT_UNKNOWN,  4:    IT_USABLE, 8:    IT_ETC,
-// 16:  IT_WEAPON,   32:  IT_ARMOR,    64:   IT_CARD,   128:  IT_PETEGG,
-// 256: IT_PETARMOR, 512: IT_UNKNOWN2, 1024: IT_AMMO,   2048: IT_DELAYCONSUME
-// 262144: IT_CASH
-show_picker.item_type: 112
-
-// Method of distribution when item party share is enabled in a party:
-// 0: Normal (item goes to a random party member)
-// 1: Item Share is disabled for non-mob drops (player/pet drops)
-// 2: Round Robin (items are distributed evenly and in order among members)
-// 3: 1+2
-party_item_share_type: 0
-
-// Is exp/item sharing disabled for idle members in the party?
-// Set to no, or the amount of seconds (NOT milliseconds) that need to pass before considering
-// a character idle.
-// Characters in a chat/vending are always considered idle.
-// A character's idle status is reset upon item use/skill use/attack (auto attack counts too)/movement.
-idle_no_share: no
-
-// Give additional experience bonus per party-member involved on even-share parties (excluding yourself)?
-// ex. If set to 10, an even-share party of 5 people will receive +40% exp (4 members * 10% exp):
-//     140% party experience in total, so each member receives 140%/5 = 28% exp (instead of 20%).
-party_even_share_bonus: 0
-
-// Display party name regardless if player is in a guild.
-// Official servers do not display party name unless the user is in a guild. (Note 1)
-display_party_name: no
diff --git a/conf/battle/pet.conf b/conf/battle/pet.conf
deleted file mode 100644
index 594184b35..000000000
--- a/conf/battle/pet.conf
+++ /dev/null
@@ -1,77 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-//--------------------------------------------------------------
-
-// Rate for catching pets (Note 2)
-pet_catch_rate: 100
-
-// Can you name a pet more then once? (Note 1)
-pet_rename: no
-
-// The rate a pet will get friendly by feeding it. (Note 2)
-pet_friendly_rate: 100
-
-// The rate at which a pet will become hungry. (Note 2)
-pet_hungry_delay_rate: 100
-
-// If your pet is hungry by how much will the friendlyness decrease by. (Default is 5)
-// Note: The friendlyness is 0-1000 total, at 0 the pet runs away.
-pet_hungry_friendly_decrease: 5
-
-// Does the pet need its equipment before it does its skill? (Note 1)
-pet_equip_required: yes
-
-// When the master attacks a monster, whether or not the pet will also attack. (Note 1)
-pet_attack_support: no
-
-// When the master receives damage from the monster, whether or not the pet attacks back. (Note 1)
-pet_damage_support: no
-
-// Minimum intimacy necessary for a pet to support their master. Default is 900
-// (intimacy goes from 0 to 1000). At this minimum, support rate is 50% of pet's normal value.
-// At max (1000) support rate is 150%.
-pet_support_min_friendly: 900
-
-// Same as above, but this is to use the pet_script field with official pet abilities.
-pet_equip_min_friendly: 900
-
-// Whether or not the pet's will use skills. (Note 1)
-// Note: Offensive pet skills need at least pet_attack_support or
-// pet_damage_support to work (they trigger while the pet is attacking).
-pet_status_support: no
-
-// Rate at which a pet will support it's owner in battle. (Note 2)
-// Affects pet_attack_support & pet_damage_support.
-pet_support_rate: 100
-
-// Does the pets owner receive exp from the pets damage?
-pet_attack_exp_to_master: no
-
-// The rate exp. is gained from the pet attacking monsters
-pet_attack_exp_rate: 100
-
-// Pet leveling system. Use 0 to disable (default).
-// When enabled, a pet's level is a fixed % of the master's. (Note 2)
-// If 200%, pet has double level, if 50% pet has half your level, etc.
-pet_lv_rate: 0
-
-// When pet leveling is enabled, what is the max stats for pets?
-pet_max_stats: 99
-
-// When pet leveling is enabled, these are the imposed caps on
-// min/max damage. Note that these only cap atk1 and atk2, if you
-// enable pet_str, their max damage is then their base_atk + pet_max_atk2
-pet_max_atk1: 500
-pet_max_atk2: 1000
-
-// Are pets disabled during Guild Wars?
-// If set to yes, pets are automatically returned to egg when entering castles during WoE times
-// and hatching is forbidden within as well.
-pet_disable_in_gvg: no
diff --git a/conf/battle/player.conf b/conf/battle/player.conf
deleted file mode 100644
index 9168a6320..000000000
--- a/conf/battle/player.conf
+++ /dev/null
@@ -1,191 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is a bit field.
-//--------------------------------------------------------------
-
-// Players' maximum HP rate? (Default is 100)
-hp_rate: 100
-
-// Players' maximum SP rate? (Default is 100)
-sp_rate: 100
-
-// Whether or not cards and attributes of the left hand are applied to the right hand attack (Note 1)
-// (It is 'yes' on official servers)
-left_cardfix_to_right: yes
-
-// The amount of HP a player will respawn with, 0 is default.
-// (Unit is in percentage of total HP, 100 is full heal of HP, 0 is respawn with 1HP total.)
-restart_hp_rate: 0
-
-// The amount of SP a player will respawn with, 0 is default.
-// (Unit is in percentage of total SP, 100 is full heal of SP, 0 is respawn with 1SP total.)
-restart_sp_rate: 0
-
-// Can a normal player by-pass the skill tree? (Note 1)
-player_skillfree: no
-
-// When set to yes, forces skill points gained from 1st class to be put into 1st class
-// skills, and forces novice skill points to be put into the basic skill. (Note 1)
-player_skillup_limit: yes
-
-// Quest skills can be learned? (Note 1)
-// Setting this to yes can open an exploit on your server!
-quest_skill_learn: no
-
-// When skills are reset, quest skills are reset as well? (Note 1)
-// Setting this to yes can open an exploit on your server!
-// NOTE: If you have quest_skill_learn set to yes, quest skills are always reset.
-quest_skill_reset: no
-
-// You must have basic skills to be able to sit, trade, form a party or create a chatroom? (Note 1)
-basic_skill_check: yes
-
-// When teleporting, or spawning to a map, how long before a monster sees you if you don't move? (time is in milliseconds)
-// That is, when you go to a map and don't move, how long before the monsters will notice you.
-// When moving, attacking or doing similar actions, the effect ends instantly.
-// Value is also affected by 'invincible_time_inc' mapflag
-player_invincible_time: 5000
-
-// When set to true, it prevent portal abuse for avoid hits. Official value is false.
-fix_warp_hit_delay_abuse: false
-
-// The time interval for HP to restore naturally. (in milliseconds)
-natural_healhp_interval: 6000
-
-// The time interval for SP to restore naturally. (in milliseconds)
-natural_healsp_interval: 8000
-
-// Automatic healing skill's time interval. (in milliseconds)
-natural_heal_skill_interval: 10000
-
-// The maximum weight for a character to carry when the character stops healing naturally. (in %)
-natural_heal_weight_rate: 50
-
-// Maximum atk speed. (Default 190, Highest allowed 199)
-max_aspd: 190
-
-// Same as max_aspd, but for 3rd classes. (Default 193, Highest allowed 199)
-max_third_aspd: 193
-
-// Maximum walk speed rate (200 would be capped to twice the normal speed)
-max_walk_speed: 300
-
-// Maximum HP. (Default is 1000000)
-max_hp: 1000000
-
-// Maximum SP. (Default is 1000000)
-max_sp: 1000000
-
-// Max limit of char stats. (agi, str, etc.)
-max_parameter: 99
-
-// Same as max_parameter, but for 3rd classes.
-max_third_parameter: 130
-
-// Same as max_parameter, but for extend classes (Ex. Super Novice, Kagero/Oboro, Rebellion).
-max_extended_parameter: 125
-
-// Same as max_parameter, but for baby classes.
-max_baby_parameter: 80
-
-// Same as max_parameter, but for baby 3rd's.
-max_baby_third_parameter: 117
-
-// Max armor def/mdef
-// NOTE: This setting have no effect if server is run on Renewal Mode (RENEWAL)
-// NOTE: does not affects skills and status effects like Mental Strength
-// If weapon_defense_type is non-zero, it won't apply to max def.
-// If magic_defense_type is non-zero, it won't apply to max mdef.
-max_def: 99
-
-// Def to Def2 conversion bonus. If the armor def/mdef exceeds max_def,
-// the remaining is converted to vit def/int mdef using this multiplier
-// (eg: if set to 10, every armor point above the max becomes 10 vit defense points)
-over_def_bonus: 0
-
-// Max weight carts can hold.
-max_cart_weight: 8000
-
-// Prevent logout of players after being hit for how long (in ms, 0 disables)?
-prevent_logout: 10000
-
-// Display the drained hp/sp values from normal attacks? (Ie: Hunter Fly card)
-show_hp_sp_drain: no
-
-// Display the gained hp/sp values from killing mobs? (Ie: Sky Deleter Card)
-show_hp_sp_gain: yes
-
-// Show the critical bonus for katar class weapon in player status window?
-// On official server, the critical bonus from katar class weapon isn't display. (Default: no)
-show_katar_crit_bonus: no
-
-// If set, when A accepts B as a friend, B will also be added to A's friend
-// list, otherwise, only A appears in B's friend list.
-// NOTE: this setting only enables friend auto-adding; auto-deletion does not work yet
-friend_auto_add: yes
-
-// Are simultaneous trade/party/guild invite requests automatically rejected?
-invite_request_check: yes
-
-// Players' will drop a 'Skull' when killed?
-// 0 = Disabled
-// 1 = Dropped only in PvP maps
-// 2 = Dropped in all situations
-bone_drop: 0
-
-// Do mounted (on Peco) characters increase their size
-// 0 = no
-// 1 = only Normal Classes on Peco have Big Size
-// 2 = only Baby Classes on Peco have Medium Size
-// 3 = both Normal Classes on Peco have Big Size
-//	and Baby Classes on Peco have Medium Size
-character_size: 0
-
-// Idle characters can receive autoloot?
-// Set to the time in seconds where an idle character will stop receiving
-// items from Autoloot (0: disabled).
-idle_no_autoloot: 0
-
-// Minimum distance a vending/chat room must be from a NPC in order to be placed
-// Default: 3 (0: disabled).
-min_npc_vendchat_distance: 3
-
-// If min_npc_vendchat_distance is enabled,
-// can players vend/chat room nearby hidden npc? (Ie: FAKE_NPC/HIDDEN_WARP_NPC)
-vendchat_near_hiddennpc: no
-
-// Super Novice's fury is enabled to increments of 10%, such as at 10.0%, 20.0% - 80.0%, 90.0%
-// Changing snovice_call_type config to 1 enables its use at 0%, for maxed super novices.
-// default: 0
-snovice_call_type: 0
-
-// How the server should measure the character's idle time? (Note 3)
-// 0x001 - Walk Request
-// 0x002 - UseSkillToID Request ( targetted skill use attempt )
-// 0x004 - UseSkillToPos Request ( aoe skill use attempt )
-// 0x008 - UseItem Request ( including equip/unequip )
-// 0x010 - Attack Request
-// 0x020 - Chat Request ( whisper, party, guild, bg, etca )
-// 0x040 - Sit/Standup Request
-// 0x080 - Emotion Request
-// 0x100 - DropItem Request
-// 0x200 - @/#Command Request
-// Please note that at least 1 option has to be enabled.
-// Be mindful that the more options used, the easier it becomes to cheat features that rely on idletime (e.g. checkidle()).
-// Default: walk ( 0x1 ) + useskilltoid ( 0x2 ) + useskilltopos ( 0x4 ) + useitem ( 0x8 ) + attack ( 0x10 ) = 0x1F
-idletime_criteria: 0x1F
-
-// Can players get ATK/DEF from refinements on costume/shadow equips?
-// Default: yes (Official behavior not known)
-costume_refine_def: yes
-shadow_refine_def: yes
-shadow_refine_atk: yes
-
-// Keep player facing direction after warping?
-// Default: no (on official servers players always faces north)
-player_warp_keep_direction: yes
diff --git a/conf/battle/skill.conf b/conf/battle/skill.conf
deleted file mode 100644
index 7622968f8..000000000
--- a/conf/battle/skill.conf
+++ /dev/null
@@ -1,303 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary)
-//--------------------------------------------------------------
-
-// The rate of time it takes to cast a spell (Note 2, 0 = No casting time)
-casting_rate: 100
-
-// Delay time after casting (Note 2)
-delay_rate: 100
-
-// Does the delay time depend on the caster's DEX and/or AGI? (Note 1)
-// Note: On Official servers, neither Dex nor Agi affect delay time
-delay_dependon_dex: no
-delay_dependon_agi: no
-
-// Minimum allowed delay for ANY skills after casting (in milliseconds) (Note 1)
-// Note: Setting this to anything above 0 can stop speedhacks.
-min_skill_delay_limit: 100
-
-// This delay is the min 'can't walk delay' of all skills.
-// NOTE: Do not set this too low, if a character starts moving too soon after
-// doing a skill, the client will not update this, and the player/mob will
-// appear to "teleport" afterwards.
-default_walk_delay: 300
-
-//Completely disable skill delay of the following types (Note 3)
-//NOTE: By default mobs don't have the skill delay as specified in the skill
-//  database, but follow their own 'reuse' skill delay which is specified on
-//  the mob skill db. When set, the delay for all skills become
-//  min_skill_delay_limit.
-no_skill_delay: 2
-
-// At what dex does the cast time become zero (instant cast)?
-castrate_dex_scale: 150
-
-// How much (dex*2+int) does variable cast turns zero?
-vcast_stat_scale: 530
-
-// What level of leniency should the skill system give for skills when
-// accounting attack motion (ASPD) for casting skills (Note 2, between 0 and 300)
-//
-// NOTE: Setting this to 100% may cause some issues with valid skills not being cast.
-//       The time difference between client and server varies so allowing 90% leniency
-//       should be enough to forgive very small margins of error.
-skill_amotion_leniency: 90
-
-// Will normal attacks be able to ignore the delay after skills? (Note 1)
-skill_delay_attack_enable: yes
-
-// Range added to skills after their cast time finishes.
-// Decides how far away the target can walk away after the skill began casting before the skill fails.
-// 0 disables this range checking (default)
-skill_add_range: 0
-
-// If the target moves out of range while casting, do we take the items and SP for the skill anyway? (Note 1)
-skill_out_range_consume: no
-
-// Does the distance between caster and target define if the skill is a ranged skill? (Note 3)
-// If set, when the distance between caster and target is greater than 3 the skill is considered long-range, otherwise it's a melee range.
-// If not set, then the range is determined by the skill's range (if it is above 5, the skill is ranged).
-// Default 14 (mobs + pets + homun)
-skillrange_by_distance: 14
-
-// Should the equipped weapon's range override the skill's range defined in the skill_db for most weapon-based skills? (Note 3)
-// NOTE: Skills affected by this option are those whose range in the skill_db are negative. By default always the skill range is used.
-// Note that if you want all monster skills to have a range of 9 you need to set monster_ai&0x400.
-skillrange_from_weapon: 0
-
-// Should a check on the caster's status be performed in all skill attacks?
-// When set to yes, meteors, storm gust and any other ground skills will have
-// no effect while the caster is unable to fight (eg: stunned).
-skill_caster_check: yes
-
-// Should ground placed skills be removed as soon as the caster dies? (Note 3)
-clear_skills_on_death: 0
-
-// Should ground placed skills be removed when the caster changes maps? (Note 3)
-clear_skills_on_warp: 15
-
-//Setting this to YES will override the target mode of ground-based skills with the flag 0x01 to "No Enemies"
-//The two skills affected by default are Pneuma and Safety Wall (if set to yes, those two skills will not protect everyone, but only allies)
-//See db/skill_unit_db.txt for more info.
-defunit_not_enemy: no
-
-// Do skills do at least 'hits' damage when they don't miss/are blocked?
-//(for example, will firebolts always do "number of bolts" damage versus plants?)
-//Values (add as appropriate): 1 for weapon-based attacks, 2 for magic attacks, 4 for misc attacks.
-skill_min_damage: 6
-
-// The delay rate of monk's combo (Note 2)
-combo_delay_rate: 100
-
-// Use alternate auto Counter Attack Skill Type? (Note 3)
-// For those characters on which it is set, 100% Critical,
-// Otherwise it disregard DEF and HIT+20, CRI*2
-auto_counter_type: 15
-
-// Can ground skills be placed on top of each other? (Note 3)
-// By default, skills with UF_NOREITERATION set cannot be stacked on top of
-// other skills, this setting will override that. (skill_unit_db)
-skill_reiteration: 0
-
-// Can ground skills NOT be placed underneath/near players/monsters? (Note 3)
-// If set, only skills with UF_NOFOOTSET set will be affected (skill_unit_db)
-skill_nofootset: 1
-
-// Should traps (hunter traps + quagmire) change their target to "all" inside gvg/pvp grounds? (Note 3)
-// Default on official servers: yes for player-traps
-gvg_traps_target_all: 1
-
-// Some traps settings (add as necessary):
-// 1: Traps are invisible to those who come into view of it. When unset, all traps are visible at all times.
-//    (Invisible traps can be revealed through Hunter's Detecting skill)
-traps_setting: 0
-
-// Restrictions applied to the Alchemist's Summon Flora skill (add as necessary)
-// 1: Enable players to damage the floras outside of versus grounds.
-// 2: Disable having different types out at the same time
-//    (eg: forbid summoning anything except hydras when there's already
-//     one hydra out)
-summon_flora_setting: 3
-
-// When songs are canceled, terminated or the character goes out of the
-// area of effect, there's an additional effect that lasts for 20 seconds
-// Should that time be reset for each song?
-// 0: No, you must recast the song AFTER those 20 seconds to have the effect again (Aegis)
-// 1: Yes, recasting songs reset the 20 seconds timer (eathena)
-song_timer_reset: 0
-
-// Whether placed down skills will check walls (Note 1)
-// (Makes it so that Storm Gust/Lord of Vermillion/etc when cast next to a wall, won't hit on the other side)
-skill_wall_check: yes
-
-// When cloaking, Whether the wall is checked or not. (Note 1)
-// Note: When the skill does not checks for walls, you will always be considered
-//  as if you had a wall-next to you (you always get the wall-based speed).
-//  Add the settings as required, being hit always uncloaks you.
-// 0 = doesn't check for walls
-// 1 = Check for walls
-// 2 = Cloaking is not canceled when attacking.
-// 4 = Cloaking is not canceled when using skills
-player_cloak_check_type: 1
-monster_cloak_check_type: 4
-
-// Can't place unlimited land skills at the same time (Note 3)
-land_skill_limit: 9
-
-//Determines which kind of skill-failed messages should be sent:
-// 0 - Enable by default
-// 1 - Disable all skill-failed messages.
-// 2 - Disable skill-failed messages due to can-act delays.
-// 4 - Disable failed message from Snatcher
-// 8 - Disable failed message from Envenom
-display_skill_fail: 0
-
-// Can a player in chat room (in-game), be warped by a warp portal? (Note 1)
-chat_warpportal: no
-
-// What should the wizard's "Sense" skill display on the defense fields?
-// 0: Do not show defense
-// 1: Base defense [RE default]
-// 2: Vit/Int defense
-// 3: Both (the addition of both)
-sense_type: 1
-
-// Which finger offensive style will be used?
-// 0 = Aegis style (single multi-hit attack)
-// 1 = Athena style (multiple consecutive attacks)
-finger_offensive_type: 0
-
-// Grandcross Settings (Don't mess with these)
-// If set to no, hit interval is increased based on the amount of mobs standing on the same cell
-// (means that when there's stacked mobs in the same cell, they won't receive all hits)
-gx_allhit: no
-
-// Grandcross display type (Default 1)
-// 0: Yellow character
-// 1: White character
-gx_disptype: 1
-
-// Max Level Difference for Devotion
-devotion_level_difference: 10
-
-// If no than you can use the ensemble skills alone. (Note 1)
-player_skill_partner_check: yes
-
-// Remove trap type
-// 0 = Aegis system : Returns 1 'Trap' item
-// 1 = Athena system : Returns all items used to deploy the trap
-skill_removetrap_type: 0
-
-// Does using bow to do a backstab give a 50% damage penalty? (Note 1)
-backstab_bow_penalty: yes
-
-// How many times you could try to steal from a mob.
-// Note: It helps to avoid stealing exploit on monsters with few rare items
-// Use 0 to disable (max allowed value is 255)
-skill_steal_max_tries: 0
-
-// Can Rogues plagiarize advanced job skills
-// 0 = no restriction
-// 1 = only stalker may plagiarize advanced skills
-// 2 = advanced skills cannot be plagiarized by anyone
-// Official servers setting: 2
-copyskill_restrict: 2
-
-// Does Berserk/Frenzy cancel other self-buffs when used?
-berserk_cancels_buffs: no
-
-// Level and Strength of "MVP heal". When someone casts a heal of this level or
-// above, the heal formula is bypassed and this value is used instead.
-max_heal: 9999
-max_heal_lv: 11
-
-// Emergency Recall Guild Skill setting (add as appropriate).
-// Note that for the skill to be usable at all,
-// you need at least one of 1/2 and 4/8
-// 1: Skill is usable outside of woe.
-// 2: Skill is usable during woe.
-// 4: Skill is usable outside of GvG grounds
-// 8: Skill is usable on GvG grounds
-//16: Disable skill from "nowarpto" maps
-//    (it will work on GVG castles even if they are set to nowarpto, though)
-emergency_call: 11
-
-// Guild Aura Skills setting (add as appropriate).
-// (This affects GD_LEADERSHIP, GD_GLORYWOUNDS, GD_SOULCOLD and GD_HAWKEYES)
-// Note that for the skill to be usable at all,
-// you need at least one of 1/2 and 4/8
-// 1: Skill works outside of woe.
-// 2: Skill works during woe.
-// 4: Skill works outside of GvG grounds
-// 8: Skill works on GvG grounds
-//16: Disable skill from affecting Guild Master
-guild_aura: 31
-
-// Allows players to skip menu when casting Teleport level 1
-// Menu contains two options. "Random" and "Cancel"
-skip_teleport_lv1_menu: no
-
-// Allow use of SG skills without proper day (Sun/Moon/Star) ?
-allow_skill_without_day: no
-
-// Allow use of ES-type magic on players?
-allow_es_magic_player: no
-
-// Miracle of the Sun, Moon and Stars skill ratio (100% = 10000)
-sg_miracle_skill_ratio: 2
-
-// Miracle of the Sun, Moon and Stars skill duration in milliseconds
-sg_miracle_skill_duration: 3600000
-
-// Angel of the Sun, Moon and Stars skill ratio (100% = 10000)
-sg_angel_skill_ratio: 10
-
-// Skills that bHealPower has effect on
-// 1: Heal, 2: Sanctuary, 4: Potion Pitcher, 8: Slim Pitcher, 16: Apple of Idun
-skill_add_heal_rate: 7
-
-// Whether the damage of EarthQuake with a single target on screen is able to be reflected.
-// Note: On official server, EQ is reflectable when there is only one target on the screen,
-//	 which might be an exploit to hunt the MVPs.
-eq_single_target_reflectable: yes
-
-// On official server, you will receive damage from Reflection and some Tarot Card even in invincible status.
-// When this setting is enabled, it allows you to immune to all kinds of damage, including those stated previous.
-// (The number will show but no actual damage will be done)
-invincible.nodamage: no
-
-// Dancing Weapon Switch
-// On official server, a fix is in place that prevents the switching of weapons to cancel songs.
-// Default: yes
-dancing_weaponswitch_fix: yes
-
-// Skill Trap Type (GvG)
-// 0: (official) Traps in GvG only make player stop moving after its walk path is complete, and it activates other traps on the way.
-// 1: Traps in GvG make player stop moving right when stepping over it.
-skill_trap_type: 0
-
-// Max Possible Level of Monster skills
-// Note: If your MVPs are too tough, reduce it to 10.
-mob_max_skilllvl: 100
-
-// Area of Bowling Bash chain reaction
-// 0: Use official gutter line system
-// 1: Gutter line system without demi gutter bug
-// 2-20: Area around caster (2 = 5x5, 3 = 7x7, 4 = 9x9, ..., 20 = 41x41)
-// Note: If you knock the target out of the area it will only be hit once and won't do splash damage
-bowling_bash_area: 0
-
-// On official servers, Storm Gust consists of 81 units that all deal 3x3 splash damage "away from center". Due to
-// south-western cells being processed first, this usually leads to a knockback to the northeast. Knockback at the
-// edges will be away from SG. Knockback direction can also be influenced by Ganbantein and Land Protector. If you
-// punch a hole into SG it will for example create a "suck in" effect.
-// If you disable this setting, the knockback direction will be completely random (eAthena style).
-stormgust_knockback: yes
diff --git a/conf/battle/status.conf b/conf/battle/status.conf
deleted file mode 100644
index 172706817..000000000
--- a/conf/battle/status.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-//--------------------------------------------------------------
-// Hercules Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-//--------------------------------------------------------------
-
-// Should skill casting be canceled when inflicted by curse/stun/sleep/etc (includes silence) (Note 3)?
-status_cast_cancel: 0
-
-// Adjustment for the natural rate of resistance from status changes.
-// If 50, status defense is halved, and you need twice as much stats to block
-// them (eg: 200 vit to completely block stun)
-pc_status_def_rate: 100
-mob_status_def_rate: 100
-
-// Maximum resistance to status changes. (100 = 100%)
-// NOTE: Cards and equipment can go over this limit, so it only applies to natural resist.
-pc_max_status_def: 100
-mob_max_status_def: 100
diff --git a/conf/import-tmpl/battle.conf b/conf/import-tmpl/battle.conf
new file mode 100644
index 000000000..4080eed72
--- /dev/null
+++ b/conf/import-tmpl/battle.conf
@@ -0,0 +1,32 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Battle local configuration file.
+//=========================================================================
+
+battle_configuration: {
+	// See conf/map/battle.conf for details
+}
diff --git a/conf/import-tmpl/battle_conf.txt b/conf/import-tmpl/battle_conf.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/conf/map/battle.conf b/conf/map/battle.conf
new file mode 100644
index 000000000..f17748fb6
--- /dev/null
+++ b/conf/map/battle.conf
@@ -0,0 +1,87 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Battle Configuration File
+//=========================================================================
+
+battle_configuration: {
+	// General battle-related settings.
+	@include "conf/map/battle/battle.conf"
+
+	// Settings specific to the client.
+	@include "conf/map/battle/client.conf"
+
+	// General drop-related configs.
+	@include "conf/map/battle/drops.conf"
+
+	// Experience rates, exp penalties, stats and max level settings.
+	@include "conf/map/battle/exp.conf"
+
+	// GM levels, atcommands and hack-related configs.
+	@include "conf/map/battle/gm.conf"
+
+	// Guild and WoE settings
+	@include "conf/map/battle/guild.conf"
+
+	// Battleground settings
+	@include "conf/map/battle/battleground.conf"
+
+	// Item/card-specific and crafting related options.
+	@include "conf/map/battle/items.conf"
+
+	// Mob related configuration
+	@include "conf/map/battle/monster.conf"
+
+	// Party related configuration
+	@include "conf/map/battle/party.conf"
+
+	// Pet related configuration
+	@include "conf/map/battle/pet.conf"
+
+	// Homunc related configuration
+	@include "conf/map/battle/homunc.conf"
+
+	// Player specific settings
+	@include "conf/map/battle/player.conf"
+
+	// Skill related settings
+	@include "conf/map/battle/skill.conf"
+
+	// Status change related settings
+	@include "conf/map/battle/status.conf"
+
+	// Feature control (on/off) settings
+	@include "conf/map/battle/feature.conf"
+
+	// Anything else that didn't fit anywhere else.
+	// Includes duel, day/night, mute/manner, log settings.
+	@include "conf/map/battle/misc.conf"
+
+	// Your custom config goes here.
+	@include "conf/import/battle.conf"
+}
+
+import: "conf/import/battle.conf"
diff --git a/conf/map/battle/battle.conf b/conf/map/battle/battle.conf
new file mode 100644
index 000000000..2e73a0aa8
--- /dev/null
+++ b/conf/map/battle/battle.conf
@@ -0,0 +1,180 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+// Battle (Battle) Configuration File
+//=========================================================================
+// Note 1: Value is a config switch (true/false)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary)
+//=========================================================================
+
+// Who should have a baseatk value (makes str affect damage)? (Note 3)
+enable_baseatk: 9
+
+// Who can have perfect flee? (Note 3)
+enable_perfect_flee: 1
+
+// Who can have critical attacks? (Note 3)
+// (Note that there are some skills that always do critical hit regardless of this)
+enable_critical: 17
+
+// Critical adjustment rate for non-players (Note 2)
+mob_critical_rate: 100
+critical_rate: 100
+
+// Should normal attacks give you a walk delay? (Note 3)
+// If false, characters can move as soon as they start an attack (attack animation
+// or walk animation may be omitted client-side, causing cropped attacks or
+// monsters that teleport to you)
+// Otherwise, the delay is equal to the 'attack animation' (amotion)
+attack_walk_delay: 15
+
+// Move-delay adjustment after being hit. (Note 2)
+// The 'can't walk' delay after being hit is calculated as a percentage of the damage animation duration.
+// NOTE: Only affects the normal delay from a single attack, not the delay added by the multihit_delay option below.
+pc_damage_walk_delay_rate: 20
+damage_walk_delay_rate: 100
+
+// Move-delay adjustment for multi-hitting attacks.
+// When hit by a multi-hitting skill like Lord of Vermillion or Jupitel Thunder, characters will be
+// unable to move for an additional "(number of hits -1) * multihit_delay" milliseconds.
+// 80 is the setting that feels like Aegis (vs Sonic Blows)
+// 230 is the setting that makes walkdelay last until the last hit (vs Jupitel thunder)
+multihit_delay: 80
+
+// Damaged delay rate for players (Note 2)
+// (Setting to false/0  will be like always endure)
+player_damage_delay_rate: 100
+
+// Should race or element be used to consider someone undead?
+// 0 = element undead
+// 1 = race undead
+// 2 = both (either one works)
+undead_detect_type: 0
+
+// Does HP recover if hit by an attribute that's same as your own? (Note 1)
+// (Will not work in Renewal)
+attribute_recover: false
+
+// What is the minimum and maximum hitrate of normal attacks?
+min_hitrate: 5
+max_hitrate: 100
+
+// Type of penalty that is applied to FLEE when more than agi_penalty_count monsters are targetting player
+// 0 = no penalty is applied
+// 1 = agi_penalty_num is reduced from FLEE as a %
+// 2 = agi_penalty_num is reduced from FLEE as an exact amount
+agi_penalty_type: 1
+
+// When agi penalty is enabled, to whom it should apply to? (Note 3)
+// By default, only players get the penalty.
+agi_penalty_target: 1
+
+// Amount of enemies required to be targetting player before FLEE begins to be penalized
+agi_penalty_count: 3
+
+// Amount of FLEE penalized per each attacking monster more than agi_penalty_count
+agi_penalty_num: 10
+
+// Type of penalty that is applied to both equipment and vit DEF when more than vit_penalty_count monsters are targetting player
+// 0 = no penalty is applied
+// 1 = vit_penalty_num is reduced from DEF as a %
+// 2 = vit_penalty_num is reduced from DEF as an exact amount
+vit_penalty_type: 1
+
+// When vit penalty is enabled, to whom it should apply to? (Note 3)
+// By default, only players get the penalty.
+vit_penalty_target: 1
+
+// Amount of enemies required to be targetting player before defense begins to be penalized
+vit_penalty_count: 3
+
+// Amount of VIT defense penalized per each attacking monster more than vit_penalty_count
+vit_penalty_num: 5
+
+// Use alternate method of DEF calculation for physical attacks.
+// With 0, disabled (use normal def% reduction with further def2 reduction)
+// At 1 or more defense is subtraction of (DEF* value).
+// eg: 10 + 50 def becomes 0 + (10*type + 50)
+weapon_defense_type: 0
+
+// MDEF, same as above....(MDEF*value)
+magic_defense_type: 0
+
+// Change attacker's direction to face opponent on every attack? (Note 3)
+// NOTE: On official servers knockback of some skills like Firewall is always based on the
+// last direction walked. Even when attacking in a completely different direction, the
+// knockback direction won't change, so e.g. if you walk north and then attack an enemy to
+// the south you will still be knocked back to the south by Firewall. Immobile monsters
+// will always be knocked back to the south as their default direction is north.
+attack_direction_change: 0
+
+// For those who is set, their innate attack element is "not elemental"
+// (100% versus on all defense-elements) (Note 3)
+// NOTE: This is the setting that makes it so non-players can hit for full
+// damage against Ghost-type targets with normal attacks (eg: vs. Ghostring).
+attack_attr_none: 14
+
+// Rate at which equipment can break (base rate before it's modified by any skills)
+// 1 = 0.01% chance. Default for official servers: 0
+equip_natural_break_rate: 0
+
+// Overall rate of which your own equipment can break. (Note 2)
+// This rate affects penalty breaking rate of skills such as power-thrust and your natural breaking rate
+// (from equip_natural_break_rate). If a Sage's endow skill fails and this is above 0, the selected char's
+// weapon will be broken.
+equip_self_break_rate: 100
+
+// Overall rate at which you can break target's equipment. (Note 2)
+// This affects the behaviour of skills like acid terror and meltdown
+equip_skill_break_rate: 100
+
+// Do weapon attacks have a attack speed delay before actual damage is applied? (Note 1)
+// NOTE: The official setting is true, even thought it degrades performance a bit.
+delay_battle_damage: true
+
+// Are arrows/ammo consumed when used on a bow/gun?
+// 0 = No
+// 1 = Yes
+// 2 = Yes even for skills that do not specify arrow consumption when said
+//     skill is weapon-based and used with ranged weapons (auto-guesses which
+//     skills should consume ammo when it's acquired via a card or plagiarize)
+arrow_decrement: 1
+
+// Should the item script bonus 'Autospell' check for range/obstacles before casting?
+// Official behavior is false, setting this to true will make skills use their defined
+// range. For example, Sonic Blow requires a 2 cell distance before autocasting is allowed.
+// This setting also affects autospellwhenhit.
+autospell_check_range: false
+
+// If both the attacker and the target are on the same tile, should the target be knocked back to the left?
+// Official behavior is true, setting this to false will knock the target back behind the attacker.
+knockback_left: true
+
+// Should the target be able of dodging damage by snapping away to the edge of the screen?
+// Official behavior is false
+snap_dodge: false
diff --git a/conf/map/battle/battleground.conf b/conf/map/battle/battleground.conf
new file mode 100644
index 000000000..629a664f7
--- /dev/null
+++ b/conf/map/battle/battleground.conf
@@ -0,0 +1,40 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+// Battle (Battlegrounds) Configuration File
+//=========================================================================
+// Note 1: Value is a config switch (true/false)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary)
+//=========================================================================
+
+// Flee penalty on BG grounds.
+// NOTE: It's %, not absolute, so 20 is -20% of your total flee
+bg_flee_penalty: 20
+
+// Interval before updating the bg-member map mini-dots (milliseconds)
+bg_update_interval: 1000
diff --git a/conf/map/battle/client.conf b/conf/map/battle/client.conf
new file mode 100644
index 000000000..818db3142
--- /dev/null
+++ b/conf/map/battle/client.conf
@@ -0,0 +1,158 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+// Battle (Client) Configuration File
+//=========================================================================
+// Note 1: Value is a config switch (true/false)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary)
+//=========================================================================
+
+// Whether to enable the official packet obfuscation support (good vs WPE)
+// 0: disabled
+// 1: optional (not recommended) -- identifies whether it is required
+// 2: enabled (recommended)
+packet_obfuscation: 1
+
+// Minimum delay between whisper/global/party/guild messages (in ms)
+// Messages that break this threshold are silently omitted.
+min_chat_delay: 0
+
+// Valid range of dyes and styles on the client.
+min_hair_style: 0
+max_hair_style: 29
+min_hair_color: 0
+max_hair_color: 8
+min_cloth_color: 0
+max_cloth_color: 4
+min_body_style: 0
+max_body_style: 4
+
+// When set to true, the damage field in packets sent from woe maps will be set
+// to -1, making it impossible for GMs, Bots and Hexed clients to know the
+// actual damage caused by attacks. (Note 1)
+hide_woe_damage: true
+
+// "hair style" number that identifies pet.
+// NOTE: The client uses the "hair style" field in the mob packet to tell them apart from mobs.
+// This value is always higher than the max hair-style available in said client.
+// Known values to work (all 2005 clients):
+// older sakexes: 20
+// sakexe 0614: 24
+// sakexe 0628 (and later): 100
+pet_hair_style: 100
+
+// Visible area size (how many squares away from a player can they see)
+area_size: 14
+
+// Maximum walk path (how many cells a player can walk going to cursor)
+// default: 17(official)
+max_walk_path: 17
+
+// Maximum allowed 'level' value that can be sent in unit packets.
+// Use together with the aura_lv setting to tell when exactly to show the aura.
+// NOTE: You also need to adjust the client if you want this to work.
+// NOTE: Default is 99. Values above 127 will probably behave incorrectly.
+// NOTE: If you don't know what this does, don't change it!!!
+max_lv: 99
+
+// Level required to display an aura.
+// NOTE: This assumes that sending max_lv to the client will display the aura.
+// NOTE: aura_lv must not be less than max_lv.
+// Example: If max_lv is 99 and aura_lv is 150, characters with level 99~149
+//          will be sent as being all level 98, and only characters with level
+//          150 or more will be reported as having level 99 and show an aura.
+aura_lv: 99
+
+// Units types affected by max_lv and aura_lv settings. (Note 3)
+// Note: If an unit type, which normally does not show an aura, is
+//       set it will obtain an aura when it meets the level requirement.
+// Default: 0 (none)
+client_limit_unit_lv: 0
+
+// Will tuxedo and wedding dresses be shown when worn? (Note 1)
+wedding_modifydisplay: false
+
+// Save Clothes color. (This will degrade performance) (Note 1)
+save_clothcolor: true
+
+// Save body styles? (Note 1)
+// Note: Don't turn this on unless you know what your doing.
+//       Sprites are not released officially.
+save_body_style: false
+
+// Do not display cloth colors for the wedding costume?
+// Note: Both save_clothcolor and wedding_modifydisplay have to be enabled
+// for this option to take effect. Set this to true if your cloth palettes 
+// pack doesn't has wedding palettes (or has less than the other jobs)
+wedding_ignorepalette: false
+
+// Do not display cloth colors for the Xmas costume?
+// Set this to true if your cloth palettes pack doesn't has Xmas palettes (or has less than the other jobs)
+xmas_ignorepalette: false
+
+// Do not display cloth colors for the Summer costume?
+// Set this to true if your cloth palettes pack doesn't has Summer palettes (or has less than the other jobs)
+summer_ignorepalette: false
+
+// Do not display cloth colors for the Hanbok costume?
+// Set this to true if your cloth palettes pack doesn't has Hanbok palettes (or has less than the other jobs)
+hanbok_ignorepalette: false
+
+// Show Hercules version to users when the login?
+display_version: false
+
+// When affected with the "Hallucination" status effect, send the effect to client? (Note 1)
+// Note: Set to false if the client lags due to the "Wavy" screen effect.
+display_hallucination: true
+
+// Set this to 1 if your client supports status change timers and you want to use them
+// Clients from 2009 onward support this
+display_status_timers: true
+
+// Randomizes the dice emoticon server-side, to prevent clients from forging
+// packets for the desired number. (Note 1)
+client_reshuffle_dice: true
+
+// Sorts the character and guild storage before it is sent to the client.
+// Official servers do not sort storage. (Note 1)
+// NOTE: Enabling this option degrades performance.
+client_sort_storage: false
+
+// Duration of client's self mute in minutes.
+// Note: Do not enable this, if you enabled commands for players,
+// because the client sees multiple commands in succession as spam.
+// Default: 0 (means disabled)
+client_accept_chatdori: 0
+
+// Limits use of blank (transparent) pixels in guild emblems to a set
+// percentage of the total.
+// Official servers do not enforce this technically to date, but some disallow
+// use of blank emblems in their rules. (Note 2)
+// A value of 100 (allowing 100% blank pixels) disables this check.
+// NOTE: Enabling this option slightly degrades performance.
+client_emblem_max_blank_percent: 100
diff --git a/conf/map/battle/drops.conf b/conf/map/battle/drops.conf
new file mode 100644
index 000000000..547a4ae4e
--- /dev/null
+++ b/conf/map/battle/drops.conf
@@ -0,0 +1,157 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+// Battle (Drops) Configuration File
+//=========================================================================
+// Note 1: Value is a config switch (true/false)
+// Note 2: Value is in percents (100 means 100%)
+//=========================================================================
+
+// If an item is dropped, does it go straight into the users inventory? (Note 1)
+item_auto_get: false
+
+// How long does it take for an item to disappear from the floor after it is dropped? (in milliseconds)
+flooritem_lifetime: 60000
+
+// Grace time during which only the person who did the most damage to a monster can get the item? (in milliseconds)
+item_first_get_time: 3000
+
+// Grace time during which only the first and second person who did the most damage to a monster can get the item? (in milliseconds)
+// (Takes effect after item_first_get_time elapses)
+item_second_get_time: 1000
+
+// Grace time during which only the first, second and third person who did the most damage to a monster can get the item? (in milliseconds)
+// (Takes effect after the item_second_get_time elapses)
+item_third_get_time: 1000
+
+// Grace time to apply to MvP reward items when the Most Valuable Player can't get the prize item and it drops on the ground? (in milliseconds)
+mvp_item_first_get_time: 10000
+
+// Grace time for the first and second MvP so they can get the item? (in milliseconds)
+// (Takes effect after mvp_item_first_get_time elapses)
+mvp_item_second_get_time: 10000
+
+// Grace time for the first, second and third MvP so they can get the item? (in milliseconds)
+// (Takes effect after mvp_item_second_get_time elapses)
+mvp_item_third_get_time: 2000
+
+// Item drop rates (Note 2)
+
+// The rate the common items are dropped (Items that are in the ETC tab, besides card)
+item_rate_common: 100
+item_rate_common_boss: 100
+item_drop_common_min: 1
+item_drop_common_max: 10000
+
+// The rate healing items are dropped (items that restore HP or SP)
+item_rate_heal: 100
+item_rate_heal_boss: 100
+item_drop_heal_min: 1
+item_drop_heal_max: 10000
+
+// The rate at which usable items (in the item tab) other then healing items are dropped.
+item_rate_use: 100
+item_rate_use_boss: 100
+item_drop_use_min: 1
+item_drop_use_max: 10000
+
+// The rate at which equipment is dropped.
+item_rate_equip: 100
+item_rate_equip_boss: 100
+item_drop_equip_min: 1
+item_drop_equip_max: 10000
+
+// The rate at which cards are dropped
+item_rate_card: 100
+item_rate_card_boss: 100
+item_drop_card_min: 1
+item_drop_card_max: 10000
+
+// The rate adjustment for the MVP items that the MVP gets directly in their inventory
+item_rate_mvp: 100
+item_drop_mvp_min: 1
+item_drop_mvp_max: 10000
+
+// The rate adjustment for card-granted item drops.
+item_rate_adddrop: 100
+item_drop_add_min: 1
+item_drop_add_max: 10000
+
+// Rate adjustment for Treasure Box drops (these override all other modifiers)
+item_rate_treasure: 100
+item_drop_treasure_min: 1
+item_drop_treasure_max: 10000
+
+// Use logarithmic drops? (Note 1)
+// Logarithmic drops scale drop rates in a non-linear fashion using the equation
+// Droprate(x,y) = x * (5 - log(x)) ^ (ln(y) / ln(5))
+// Where x is the original drop rate and y is the drop_rate modifier (the previously mentioned item_rate* variables)
+// Use the following table for an idea of how the rate will affect drop rates when logarithmic drops are used:
+// Y: Original Drop Rate
+// X: Rate drop modifier (eg: item_rate_equip)
+//  X\Y | 0.01 0.02  0.05  0.10  0.20  0.50  1.00  2.00  5.00 10.00 20.00
+// -----+---------------------------------------------------------------
+//   50 | 0.01 0.01  0.03  0.06  0.11  0.30  0.62  1.30  3.49  7.42 15.92
+//  100 | 0.01 0.02  0.05  0.10  0.20  0.50  1.00  2.00  5.00 10.00 20.00
+//  200 | 0.02 0.04  0.09  0.18  0.35  0.84  1.61  3.07  7.16 13.48 25.13
+//  500 | 0.05 0.09  0.22  0.40  0.74  1.65  3.00  5.40 11.51 20.00 33.98
+// 1000 | 0.10 0.18  0.40  0.73  1.30  2.76  4.82  8.28 16.47 26.96 42.69
+// 2000 | 0.20 0.36  0.76  1.32  2.28  4.62  7.73 12.70 23.58 36.33 53.64
+// 5000 | 0.50 0.86  1.73  2.91  4.81  9.11 14.45 22.34 37.90 53.91 72.53
+//10000 | 1.00 1.67  3.25  5.28  8.44 15.24 23.19 34.26 54.57 72.67 91.13
+//20000 | 2.00 3.26  6.09  9.59 14.83 25.49 37.21 52.55 77.70 97.95  100%
+//50000 | 5.00 7.87 13.98 21.12 31.23 50.31 69.56 92.48  100%  100%  100%
+item_logarithmic_drops: false
+
+// Can the monster's drop rate become 0? (Note 1)
+// Default: false (as in official servers).
+drop_rate0item: false
+
+// Makes your LUK value affect drop rates on an absolute basis.
+// Setting to 100 means each luk adds 0.01% chance to find items
+// (regardless of item's base drop rate).
+drops_by_luk: 0
+
+// Makes your LUK value affect drop rates on a relative basis.
+// Setting to 100 means each luk adds 1% chance to find items
+// (So at 100 luk, everything will have double chance of dropping).
+drops_by_luk2: 0
+
+// Whether or not Marine Spheres and Floras summoned by Alchemist drop items?
+// This setting has three available values:
+// 0: Nothing drops.
+// 1: Only marine spheres drop items.
+// 2: All alchemist summons drop items.
+alchemist_summon_reward: 1
+
+// Make broadcast ** Player1 won Pupa's Pupa Card (chance 0.01%) ***
+// This can be set to any value between 0~10000.
+// Note: It also announces STEAL skill usage with rare items
+// 0 = don't show announces at all
+// 1 = show announces for 0.01% drop chance items
+// 333 = show announces for 3.33% or lower drop chance items
+// 10000 = show announces for all items
+rare_drop_announce: 0
diff --git a/conf/map/battle/exp.conf b/conf/map/battle/exp.conf
new file mode 100644
index 000000000..3a38c1c6c
--- /dev/null
+++ b/conf/map/battle/exp.conf
@@ -0,0 +1,114 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+// Battle (Experience) Configuration File
+//=========================================================================
+// Note 1: Value is a config switch (true/false)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: The max level of classes is stored in the exp table.
+//         See files db/exp.txt and db/exp2.txt to change them.
+//=========================================================================
+
+// Rate at which exp. is given. (Note 2)
+base_exp_rate: 100
+
+// Rate at which job exp. is given. (Note 2)
+job_exp_rate: 100
+
+// Turn this on to allow a player to level up more than once from a kill. (Note 1)
+multi_level_up: false
+
+// Setting this can cap the max experience one can get per kill specified as a
+// % of the current exp bar. (Every 10 = 1.0%)
+// For example, set it to 500 and no matter how much exp the mob gives,
+// it can never give you above half of your current exp bar.
+max_exp_gain_rate: 0
+
+// Method of calculating earned experience when defeating a monster:
+// 0 = uses damage given / total damage as damage ratio
+// 1 = uses damage given / max_hp as damage ratio
+// NOTE: Using type 1 disables the bonus where the first attacker gets
+//       his share of the exp doubled when multiple people attack the mob.
+exp_calc_type: 0
+
+// Experience increase per attacker. That is, every additional attacker to the
+// monster makes it give this much more experience
+// (eg: 5 people attack with 25 here, +(25*4)% -> +100% exp)
+exp_bonus_attacker: 25
+
+// Max number of attackers at which exp bonus is capped
+// (eg: if set at 5, the max bonus is 4*bonus-per-char regardless of attackers)
+exp_bonus_max_attacker: 12
+
+// MVP bonus exp rate. (Note 2)
+mvp_exp_rate: 100
+
+// Rate of base/job exp given by NPCs. (Note 2)
+quest_exp_rate: 100
+
+// The rate of job exp. from using Heal skill (100 is the same as the heal amount, 200 is double.
+// The balance of the exp. rate is best used with 5 to 10)
+heal_exp: 0
+
+// The rate of exp. that is gained by the process of resurrection, a unit is 0.01%.
+// Experience calculations for the experience value * level difference of the person revived / 100 * resurrection_exp/10000 which the revived player has can be got.
+resurrection_exp: 0
+
+// The rate of job exp. when using discount and overcharge on an NPC
+// (in 0.01% increments - 100 is 1%, 10000 is normal, 20000 is double.)
+// The way it is calculated is (money received * skill lv) * shop_exp / 10000.
+shop_exp: 0
+
+// PVP exp.  Do players get exp in PvP maps
+// (Note: NOT exp from players, but from normal leveling)
+pvp_exp: true
+
+// When a player dies, how should we penalize them?
+// 0 = No penalty.
+// 1 = Lose % of current level when killed.
+// 2 = Lose % of total experience when killed.
+death_penalty_type: 1
+
+// Base exp. penalty rate (Each 100 is 1% of their exp)
+death_penalty_base: 100
+
+// Job exp. penalty rate (Each 100 is 1% of their exp)
+death_penalty_job: 100
+
+// When a player dies (to another player), how much zeny should we penalize them with?
+// NOTE: It is a percentage of their zeny, so 100 = 1%
+zeny_penalty: 0
+
+// Will display experience gained from killing a monster. (Note 1)
+disp_experience: false
+
+// Will display zeny earned (from mobs, trades, etc) (Note 1)
+disp_zeny: false
+
+// Use the contents of db/statpoint.txt when doing a stats reset and leveling up? (Note 1)
+// If false, an equation will be used which preserves statpoints earned/lost
+// through external means (ie: stat point buyers/sellers)
+use_statpoint_table: true
diff --git a/conf/map/battle/feature.conf b/conf/map/battle/feature.conf
new file mode 100644
index 000000000..003e4c75a
--- /dev/null
+++ b/conf/map/battle/feature.conf
@@ -0,0 +1,58 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+// Battle (Feature) Configuration File
+//=========================================================================
+// Note 1: Value is a config switch (true/false)
+//=========================================================================
+
+features: {
+	// Buying store (Note 1)
+	// Requires: 2010-04-27aRagexeRE or later
+	buying_store: true
+
+	// Search stores (Note 1)
+	// Requires: 2010-08-03aRagexeRE or later
+	search_stores: true
+
+	// Atcommand suggestions (Note 1)
+	// If one type incomplete atcommand, it will suggest the complete ones.
+	atcommand_suggestions: false
+
+	// Banking (Note 1)
+	// Requires: 2013-07-24aRagexe or later
+	banking: true
+
+	// Auction (Note 1)
+	// Feature became unstable on clients 2012 onwards (exact date not known),
+	// it has been fixed on clients 2013-05-15 onwards however.
+	auction: false
+
+	// Roulette (Note 1)
+	// Requires: 2014-10-22bRagexe or later
+	// Disabled by default while test version is out; enable at your own risk -- the mean dev.
+	roulette: false
+}
diff --git a/conf/map/battle/gm.conf b/conf/map/battle/gm.conf
new file mode 100644
index 000000000..bcc70b63b
--- /dev/null
+++ b/conf/map/battle/gm.conf
@@ -0,0 +1,66 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+// Battle (GM) Configuration File
+//=========================================================================
+// Note 1: Value is a config switch (true/false)
+// Note 2: Value is in percents (100 means 100%)
+//=========================================================================
+
+// The maximum quantity of monsters that can be summoned per GM command (0 denotes an unlimited quantity)
+atcommand_spawn_quantity_limit: 100
+
+// Maximum number of slave-clones that can be have by using the @slaveclone at command. (0 denotes unlimited quantity)
+atcommand_slave_clone_limit: 25
+
+// If false, commands require exact player name. If true, entering a partial
+// name will work, as long as there's only one match from all players in the
+// current map server.
+partial_name_scan: true
+
+// (@) @allstats/@str/@agi/@vit/@int/@dex/@luk
+// allow gms to bypass the maximum stat parameter? ( if true gm stats can go up to 32k )
+// default: false
+atcommand_max_stat_bypass: false
+
+// Ban people that try trade dupe.
+// Duration of the ban, in minutes (default: 5). To disable the ban, set 0.
+ban_hack_trade: 5
+
+// requires RENEWAL_DROP to be enabled (src/map/config/renewal.h)
+// modifies @mobinfo to display the users' real drop rate as per renewal_drop formula
+// modifies @iteminfo to not display the minimum item drop rate (since it can't tell the mob level)
+atcommand_mobinfo_type: 0
+
+// Ignore warpable area configuration.
+// Set the minimum group id to ignore invalid cells when warping.
+// Default group is 2. Use 100 to disable this setting.
+gm_ignore_warpable_area: 2
+
+// Should atcommands trigger level up events for NPCs? (Note 1)
+// This option is for @baselevelup and @joblevelup
+// Default: false
+atcommand_levelup_events: false
diff --git a/conf/map/battle/guild.conf b/conf/map/battle/guild.conf
new file mode 100644
index 000000000..c8f8db8c3
--- /dev/null
+++ b/conf/map/battle/guild.conf
@@ -0,0 +1,73 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+// Battle (Guild) Configuration File
+//=========================================================================
+// Note 1: Value is a config switch (true/false)
+// Note 2: Value is in percents (100 means 100%)
+//=========================================================================
+
+// When making a guild, an Emperium is consumed? (Note 1)
+guild_emperium_check: true
+
+// Maximum tax limit on a guild member.
+guild_exp_limit: 50
+
+// Maximum castles one guild can own (0 = unlimited)
+guild_max_castles: 0
+
+// Restart guild skills cooldown by relog? (Note 1)
+// When false, you relog with the same cooldown remaining as from when you
+// logged out, true restarts the cooldown upon login to its full duration. 
+guild_skill_relog_delay: false
+
+// Damage adjustments for WOE battles against defending Guild monsters (Note 2)
+castle_defense_rate: 100
+
+// Flee penalty on gvg grounds. Official value is 20 (Note 2)
+// NOTE: It's %, not absolute, so 20 is -20% of your total flee
+gvg_flee_penalty: 20
+
+// Can the 'Glory of Guild' skill be learnt in the Guild window,
+// and does changing emblems require it? (Note 1)
+// P.S: This skill is not implemented on official servers
+require_glory_guild: false
+
+// Limit Guild alliances. Value is 0 to 3.
+// If you want to change this value, clear the guild alliance table.
+// Default is 3
+max_guild_alliance: 3
+
+// When to re-display the guild notice
+// Upon teleporting (regardless of changing maps): 2 (official)
+// Upon changing maps: 1
+// Do not re-display: 0 (disabled)
+guild_notice_changemap: 2
+
+// Can guild members invite/expel members inside guild castles in WoE/GvG? (Note 1)
+// default: false
+guild_castle_invite: false
+guild_castle_expulsion: false
diff --git a/conf/map/battle/homunc.conf b/conf/map/battle/homunc.conf
new file mode 100644
index 000000000..0bf2a4b98
--- /dev/null
+++ b/conf/map/battle/homunc.conf
@@ -0,0 +1,68 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+// Battle (Homunculus) Configuration File
+//=========================================================================
+// Note 1: Value is a config switch (true/false)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary)
+//=========================================================================
+
+// Homunculus setting (Note 3)
+// Activates various 'quirks' that makes them behave unlike normal characters.
+// 0x001: Can't be targetted by support skills (except for their master)
+// 0x004: Mobs will always go after them instead of players until attacked
+// 0x008: Copy their master's speed on spawn/map-change
+// 0x010: They display luk/3+1 instead of their actual critical in the
+//        stat window (by default they don't crit)
+// 0x020: Their Min-Matk is always the same as their max
+// 0x040: Skill re-use delay is reset when they are vaporized.
+hom_setting: 0x1D
+
+// The rate a homunculus will get friendly by feeding it. (Note 2)
+homunculus_friendly_rate: 100
+
+// Can you name a homunculus more then once? (Note 1)
+hom_rename: false
+
+// Intimacy needed to use Evolved Vanilmirth's Bio Explosion
+hvan_explosion_intimate: 45000
+
+// Show stat growth to the owner when an Homunculus levels up
+homunculus_show_growth: true
+
+// Does autoloot work, when a monster is killed by homunculus only?
+homunculus_autoloot: true
+
+// Should homunculi Vaporize when Master dies?
+homunculus_auto_vapor: true
+
+// Max level for regular Homunculus
+homunculus_max_level: 99
+
+// Max level for Homunculus S
+homunculus_S_max_level: 150
diff --git a/conf/map/battle/items.conf b/conf/map/battle/items.conf
new file mode 100644
index 000000000..8ff2cbb3b
--- /dev/null
+++ b/conf/map/battle/items.conf
@@ -0,0 +1,116 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+// Battle (Items) Configuration File
+//=========================================================================
+// Note 1: Value is a config switch (true/false)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary)
+//=========================================================================
+
+// The highest value at which an item can be sold via the merchant vend skill. (in zeny)
+vending_max_value: 1000000000
+
+// Whether to allow buying from vending chars that are at their max. zeny limit.
+// If set to true, the rest of the zeny above the char's capacity will disappear.
+vending_over_max: true
+
+// Tax to apply to all vending transactions (eg: 10000 = 100%, 50 = 0.50%)
+// When a tax is applied, the item's full price is charged to the buyer, but
+// the vender will not get the whole price paid (they get 100% - this tax).
+vending_tax: 200
+
+// Show the buyer's name when successfully vended an item
+buyer_name: true
+
+// Forging success rate. (Note 2)
+weapon_produce_rate: 100
+
+// Prepare Potion success rate. (Note 2)
+potion_produce_rate: 100
+
+// Do produced items have the maker's name on them? (Note 3)
+// 0x01: Produced Weapons
+// 0x02: Produced Potions
+// 0x04: Produced Arrows
+// 0x08: Produced Holy Water/Ancilla
+// 0x10: Produced Deadly Potions
+// 0x80: Other produced items.
+produce_item_name_input: 0x03
+
+// Is a monster summoned via dead branch aggressive? (Note 1)
+dead_branch_active: true
+
+// Should summoned monsters check the player's base level? (dead branches) (Note 1)
+// On officials this is false - monsters summoned from dead/bloody branches can be ANY level.
+// Change to true to only summon monsters less than or equal to the player's base level.
+random_monster_checklv: false
+
+// Can any player equip any item regardless of the gender restrictions
+// NOTE: Wedding Rings and Whips/Musical Instruments will check gender regardless of setting.
+ignore_items_gender: true
+
+// Item check? (Note 1)
+// On map change it will check for items not tagged as "available" and
+// auto-delete them from inventory/cart.
+// NOTE: An item is not available if it was not loaded from the item_db or you
+// specify it as unavailable in db/item_avail.txt
+item_check: false
+
+// How much time must pass between item uses?
+// Only affects the delay between using items, prevents healing item abuse. Recommended ~500 ms
+// On officials this is 0, but it's set to 100ms as a measure against bots/macros.
+item_use_interval: 100
+
+// How much time must pass between cash food uses? Default: 60000 (1 min)
+cashfood_use_interval: 60000
+
+// Required level of bNoMagicDamage before Status Changes are blocked (Golden Thief Bug card).
+// For example, if left at 50. An item can give bNoMagicDamage,40;
+// which reduces magic damage by 40%, but does not blocks status changes.
+gtb_sc_immunity: 50
+
+// Enable autospell card effects to stack?
+// NOTE: Different cards that grant the same skill will both
+// always work independently of each other regardless of setting.
+autospell_stacking: false
+
+// Will disabled consumables (disabled by map_zone_db.conf) be consumed when trying to use them?
+// Default: true (official)
+item_restricted_consumption_type: true
+
+// Enable all NPC to allow changing of equipments while interacting? (Note 1)
+// Script commands 'enable_items/disable_items' will not be override. (see doc/script_commands.txt)
+// Default: true (official)
+item_enabled_npc: true
+
+// Unequip the equipments that has disabled by map_zone_db.conf ?
+// 0 : disabled equipments and cards are nullify (official)
+// 1 : disabled equipments are unequip, disabled cards are nullify
+// 2 : disabled equipments are nullify, disabled cards will caused the equipment to unequip
+// 3 : disabled equipments are unequip, disabled cards will caused the equipment to unequip (1+2)
+unequip_restricted_equipment: 0
diff --git a/conf/map/battle/misc.conf b/conf/map/battle/misc.conf
new file mode 100644
index 000000000..bc97b716a
--- /dev/null
+++ b/conf/map/battle/misc.conf
@@ -0,0 +1,173 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+// Battle (Misc) Configuration File
+//=========================================================================
+// Note 1: Value is a config switch (true/false)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary)
+//=========================================================================
+
+// PK Server Mode.
+//   Turns entire server pvp(excluding towns).
+//   Experience loss is doubled if killed by another player.
+//   When players hunt monsters over 20 levels higher, they will receive 15%
+//   additional exp., and 25% chance of receiving more items.
+//   There is a nopvp.txt for setting up maps not to have pk on in this mode.
+//   Novices cannot be attacked and cannot attack.
+//   Normal pvp counter and rank display are disabled as well.
+// Note: If pk_mode is set to 2 instead of 1, players will receive a
+//   manner penalty of 5 each time they kill another player (see manner_system
+//   config to adjust how this will affect players)
+pk_mode: 0
+
+// Manner/karma system configuration. Specifies how does negative manner
+// (red no chat bubble) affects players (add as needed):
+//  0: No penalties.
+//  1: Disables chatting (includes whispers, party/guild msgs, etc)
+//  2: Disables skill usage
+//  4: Disables commands usage
+//  8: Disables item usage/picking/dropping
+// 16: Disables room creation (chatrooms and vending shops)
+manner_system: 31
+
+// For PK Server Mode. Change this to define the minimum level players can start PK-ing
+pk_min_level: 55
+
+// For PK Server Mode. It specifies the maximum level difference between
+// players to let them attack each other. 0 disables said limit.
+pk_level_range: 0
+
+// Display skill usage in console? (for debug only) (default: false) (Note 3)
+skill_log: false
+
+// Display battle log? (for debug only) (default: false) (Note 1)
+battle_log: false
+
+// Display other stuff? (for debug only) (default: false) (Note 1)
+etc_log: false
+
+// Do you want to debug warp points? If set to true, warp points will appear as flags.(Note 1)
+// It will also run on start-up a warp-check to print out which warp points lead directly on
+// top of on-touch npcs (which can lead to infinite loopback warping situations)
+warp_point_debug: false
+
+// Choose if server begin with night (true) or day (false)
+night_at_start: false
+
+// Define duration in msec of the day (default: 7200000 = 2 hours)
+// Set to 0 to disable day cycle (but not @day GM command).
+// Except 0, minimum is 60000 (1 minute)
+day_duration: 0
+
+// Define duration in msec of the night (default: 1800000 = 30 min)
+// Set to 0 to disable night cycle (but not @night GM command).
+// Except 0, minimum is 60000 (1 minute)
+night_duration: 0
+
+// Using duel on pvp-maps
+duel_allow_pvp: false
+
+// Using duel on gvg-maps
+duel_allow_gvg: false
+
+// Allow using teleport/warp when dueling
+duel_allow_teleport: false
+
+// Autoleave duel when die
+duel_autoleave_when_die: true
+
+// Delay between using @duel in minutes
+duel_time_interval: 60
+
+// Restrict duel usage to same map
+duel_only_on_same_map: false
+
+// Determines max number of characters that can stack within a single cell.
+// Official - Only affects the walking routines of characters, including monsters.
+// If a unit stops walking and is on a cell with more than stack limit
+// characters on it, it will walk to the closest free cell.
+// Custom - This variation will make every full cell to be considered a wall.
+// NOTE: For this setting to take effect you have to use a server compiled
+// with Cell Stack Limit support (see src/map/map.h)
+official_cell_stack_limit: 1
+custom_cell_stack_limit: 1
+
+// If false while walking not check occupied cells
+// If true while walking check occupied cells
+check_occupied_cells: true
+
+// Allow autotrade only in map with autotrade flag?
+// Set this to "false" will allow autotrade where no "autotrade" mapflag is set
+// Set this to "true" to only allow autotrade on maps with "autotrade" mapflag
+at_mapflag: false
+
+// Set this to the amount of minutes autotrade chars will be kicked from the server.
+at_timeout: 0
+
+// Auction system, fee per hour. Default is 12000
+auction_feeperhour: 12000
+
+// Auction maximum sell price
+auction_maximumprice: 500000000
+
+// Minimum delay between each store search query in seconds.
+searchstore_querydelay: 10
+
+// Maximum amount of results a store search query may yield, before
+// it is canceled.
+searchstore_maxresults: 30
+
+// Whether or not gaining and loosing of cash points is displayed (Note 1).
+// Default: false
+cashshop_show_points: false
+
+// Whether or not mail box status is displayed upon login.
+// Default: 0
+// 0 = No
+// 1 = Yes
+// 2 = Yes, when there are unread mails
+mail_show_status: 0
+
+// Is monster transformation disabled during Guild Wars?
+// If set to true, monster transforming is automatically removed/disabled when entering castles during WoE times
+mon_trans_disable_in_gvg: false
+
+// Whether AegisName and SpriteName lookups are case sensitive
+// Default: true (as in official servers)
+// When this is set to true, item and monster lookups through atcommands and
+//   script commands will match AegisNames and SpriteNames only when the case
+//   matches. Display name lookups are not affected by this setting.
+// Example: Given the two items:
+// -  { Id: 553,  AegisName: "Bun",  Name: "Bao" }
+// -  { Id: 6115, AegisName: "Bun_", Name: "Bun" }
+// query       when true     when false
+// @item bun   # 6115        # 553
+// @item Bun   # 553         # 553
+// @item Bao   # 553         # 553
+// @item Bun_  # 6115        # 6115
+case_sensitive_aegisnames: true
diff --git a/conf/map/battle/monster.conf b/conf/map/battle/monster.conf
new file mode 100644
index 000000000..48e476161
--- /dev/null
+++ b/conf/map/battle/monster.conf
@@ -0,0 +1,261 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+// Battle (Monster) Configuration File
+//=========================================================================
+// Note 1: Value is a config switch (true/false)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary)
+//=========================================================================
+
+// The HP rate of MVPs. (Note 2)
+mvp_hp_rate: 100
+
+// The HP rate of normal monsters (that is monsters that are not MVP's) (Note 2)
+monster_hp_rate: 100
+
+// The maximum attack speed of a monster
+monster_max_aspd: 199
+
+// Defines various mob AI related settings. (Note 3)
+// 0x001: When enabled mobs will update their target cell every few iterations
+//        (normally they never update their target cell until they reach it while
+//        chasing)
+// 0x002: Makes mob use their "rude attack" skill (usually warping away) if they
+//        are attacked and they can't attack back regardless of how they were
+//        attacked (eg: GrimTooth), otherwise, their rude attack" is only activated
+//        if they can't melee reach the target (eg: sniping)
+// 0x004: If not set, mobs that can change target only do so when melee attacked
+//        (distance player/mob < 3), otherwise mobs may change target and chase
+//        ranged attackers. This flag also overrides the 'provoke' target.
+// 0x008: When set, mobs scatter as soon as they lose their target. Use this mode
+//        to make it much harder to mob-train by hiding and collecting them on a
+//        single spot (ie: GrimTooth training)
+// 0x010: If set, mob skills defined for friends will also trigger on themselves.
+// 0x020: When set, the monster ai is executed for all monsters in maps that
+//        have players on them, instead of only for mobs who are in the vicinity
+//        of players.
+// 0x040: When set, when the mob's target changes map, the mob will walk towards
+//        any npc-warps in it's sight of view (use with mob_warp below)
+// 0x100: When set, a mob will pick a random skill from it's list and start from
+//        that instead of checking skills in orders (when unset, if a mob has too
+//        many skills, the ones near the end will rarely get selected)
+// 0x200: When set, a mob's skill re-use delay will not be applied to all entries of
+//        the same skill, instead, only to that particular entry (eg: Mob has heal
+//        on six lines in the mob_skill_db, only the entry that is actually used
+//        will receive the delay). This will make monsters harder, especially MvPs.
+// 0x400: Set this to make mobs have a range of 9 for all skills. Otherwise, they
+//        will obey the normal skill range rules.
+// Example: 0x140 -> Chase players through warps + use skills in random order.
+monster_ai: 0
+
+// How often should a monster rethink its chase?
+// 0: Every 100ms (MIN_MOBTHINKTIME)
+// 1: Every cell moved
+// 2: Every 2 cells moved
+// 3: Every 3 cells moved (official)
+// x: Every x cells moved
+// Regardless of this setting, a monster will always rethink its chase if it has
+// reached its target. Increase this value if you want to make monsters continue
+// moving after they lost their target (hide, no line of sight, etc.).
+monster_chase_refresh: 3
+
+// Should mobs be able to be warped (add as needed)?
+// 0: Disable.
+// 1: Enable mob-warping when standing on NPC-warps
+// 2: Enable mob-warping when standing on Priest Warp Portals
+// 4: Disable warping when the target map is a 'nobranch' map.
+mob_warp: 0
+
+// If these are set above 0, they define the time (in ms) during which monsters
+// will have their 'AI' active after all players have left their vicinity.
+mob_active_time: 0
+boss_active_time: 0
+
+// Mobs and Pets view-range adjustment (range2 column in the mob_db) (Note 2)
+view_range_rate: 100
+
+// Chase Range is the base minimum-chase that a mob gives before giving up
+// (as long as the target is outside their field of view). This is the range3
+// column in the mob_db. (Note 2)
+chase_range_rate: 100
+
+// Allow monsters to be aggresive and attack first? (Note 1)
+monster_active_enable: true
+
+// Should the mob_db names override the mob names specified in the spawn files?
+// 0: No
+// 1: always use the mob_db Name column (english mob name)
+// 2: always use the mob_db JName column (original Kro mob name)
+override_mob_names: 0
+
+// Monster damage delay rate (Note 2)
+// Setting to 0 is like they always have endure.
+monster_damage_delay_rate: 100
+
+// Looting monster actions.
+// 0 = Monster will consume the item.
+// 1 = Monster will not consume the item.
+monster_loot_type: 0
+
+// Chance of mob casting a skill (Note 2)
+// Higher rates lead to 100% mob skill usage with no/few normal attacks.
+// Set to 0 to disable mob skills.
+mob_skill_rate: 100
+
+// Mob skill delay adjust (Note 2)
+// After a mob has casted a skill, there is a delay before being able to
+// re-cast it. Note that skills with a delay of 0 can't be affected by this
+// setting.
+mob_skill_delay: 100
+
+// Rate of monsters on a map, 200 would be twice as many as normal. (Note 2)
+mob_count_rate: 100
+
+// Respawn rate of monsters on a map. 50 would make mobs respawn twice as fast (half delay time) (Note 2)
+//Note: This does not affects mobs with immediate respawn (most normal mobs)
+mob_spawn_delay: 100
+plant_spawn_delay: 100
+boss_spawn_delay: 100
+
+// Should mobs not spawn within the viewing range of players?
+// 0 is disabled, otherwise it is the number of retries before giving up
+// and spawning the mob within player-view anyway, unless the max (100) is used,
+// in which case the mob will not be spawned, and it'll be retried again in
+// 5 seconds.
+// NOTE: This has no effect on mobs that always spawn on the very same cell
+// (like ant eggs) except if you set it to the max.
+no_spawn_on_player: 0
+
+// Should spawn coordinates in the mob-spawn files be ignored? (Note 1)
+// If set to true, all monsters will have a random respawn spot across the whole
+// map regardless of what the mob-spawn file says.
+force_random_spawn: false
+
+// Do summon slaves inherit the passive/aggressive traits of their master?
+// 0: No, retain original mode.
+// 1: Slaves are always aggressive.
+// 2: Slaves are always passive.
+// 3: Same as master's aggressive/passive state.
+slaves_inherit_mode: 2
+
+// Do summon slaves have the same walking speed as their master?
+// NOTE: The default is 3 for official servers.
+// 0: Never.
+// 1: If the master can walk
+// 2: If the master can't walk (even motionless mobs have a speed
+//    entry in their mob_db)
+// 3: Always
+slaves_inherit_speed: 3
+
+// Will summoned monsters (alchemists, or @summon'ed monsters) attack cause a
+// chance of triggering the master's autospell cards? (Note 1)
+summons_trigger_autospells: true
+
+// When a mob is attacked by another monster, will the mob retaliate against the master of said mob instead of the mob itself?
+// NOTE: Summoned mobs are both those acquired via @summon and summoned by Alchemists
+retaliate_to_master: true
+
+// Whether mobs should change target temporarily when a skill triggers a counter mob skill (Note 1)
+// eg: Mob attacks player B, and player A casts a skill C. If set to true and the
+// mob has a skill that is triggered by skill C, then A will be the target of
+// the skill, otherwise B will be targetted by the reaction skill.
+mob_changetarget_byskill: false
+
+// If monster's class is changed will it fully recover HP? (Note 1)
+monster_class_change_full_recover: true
+
+// Display some mob info next to their name? (add as needed)
+// (does not works on guardian or Emperium)
+// 1: Display mob HP (Hp/MaxHp format)
+// 2: Display mob HP (Percent of full life format)
+// 4: Display mob's level
+show_mob_info: 0
+
+// Zeny from mobs
+zeny_from_mobs: false
+
+// Monsters level up (monster will level up each time a player is killed and they will grow stronger)
+// Exp rate is calculated ((monster level-original monster level)*(exp*(mobs_level_up_exp rate/100)))
+// NOTE: Does not apply to WoE Guardians.
+mobs_level_up: false
+mobs_level_up_exp_rate: 1
+
+// Dynamic Mobs Options
+// Use dynamic mobs? (recommended for small-medium sized servers)
+dynamic_mobs: true
+
+// Remove Mobs even if they are hurt
+mob_remove_damaged: true
+
+// Delay before removing mobs from empty maps (default 5 min = 300 secs)
+mob_remove_delay: 300000
+
+// Defines on who the mob npc_event gets executed when a mob is killed.
+// Type 1: On the player that killed the mob (if killed by a non-player, resorts to type 0)
+// Type 0: On the player that did the most damage to the mob.
+// NOTE: This affects who gains the Castle when the Emperium is broken.
+mob_npc_event_type: 1
+
+// Time in milliseconds to activate protection against Kill Steal
+// Set to 0 to disable it.
+// If this is activated and a player is using @noks, damage from others players (KS) not in the party
+// will be reduced to 0.
+ksprotection: 0
+
+// Should MVP slaves retain their target when summoned back to their master?
+mob_slave_keep_target: true
+
+// Whether or not to spawn the mvp tomb.
+// See http://irowiki.org/wiki/MVP#Gravestone
+mvp_tomb_enabled: true
+
+// Show hp bar on monsters? (Default: yes)
+// NOTE: only works on client 2012-04-04aRagexeRE onwards
+show_monster_hp_bar: true
+
+// Whether or not the size of specially summoned mobs influences experience, drop rates,
+// and stats. The rates will be doubled for large mobs, and halved for small ones.
+// This is only invoked under the 'monster' command, @monsterbig, and @monstersmall. (Note 1)
+// Default: false
+mob_size_influence: false
+
+// How should a monster be trapped by an icewall casted directly on it?
+// On official servers, monsters can only leave an icewall to the west and south. If their target is north or east of
+// them they will continously try to chase it but fail doing so. This brings them into a loop during which they will use
+// idle and chase skills. Boss monsters on the other hand will behave like a trapped monster, do not move and will use
+// idle and rudeattacked skills (when attacked).
+// 0: Monster won't be stuck in icewall at all.
+// 1: Monster will behave like a trapped monster.
+// 2-255: Number of loops a monster will go through the behavior described above before it frees itself from icewall.
+// NOTE: On some servers, normal monsters can free themselves after 15-35 second depending on their speed. On other
+// servers, they will be stuck inside icewall until it expires. Also, many official servers (e.g. iRO) have casting
+// icewall completely blocked on all maps that have boss monsters on them.
+// Default (least exploitable): mob - 75, boss - 0
+// Default (most official): mob - 220, boss - 1
+mob_icewall_walk_block: 220
+boss_icewall_walk_block: 1
diff --git a/conf/map/battle/party.conf b/conf/map/battle/party.conf
new file mode 100644
index 000000000..07a0bdaea
--- /dev/null
+++ b/conf/map/battle/party.conf
@@ -0,0 +1,76 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+// Battle (Party) Configuration File
+//=========================================================================
+// Note 1: Value is a config switch (true/false)
+// Note 2: Value is in percents (100 means 100%)
+//=========================================================================
+
+// If someone steals (gank/steal skills), show name in party? (Note 1)
+show_steal_in_same_party: false
+
+// Interval before updating the party-member map mini-dots (milliseconds)
+party_update_interval: 1000
+
+// Method used to update party-mate hp-bars:
+// 0: Aegis - bar is updated every time HP changes (bandwidth intensive)
+// 1: Athena - bar is updated with the party map dots (up to 1 second delay)
+party_hp_mode: 0
+
+// When 'Party Share' item sharing is enabled in a party,
+// announce in the party which party-member received the item and what's he received? (Note 1)
+show_party_share_picker: true
+
+// What types of items are going to be announced when 'show_party_share_picker' is active?
+// 1:   IT_HEALING,  2:   IT_UNKNOWN,  4:    IT_USABLE, 8:    IT_ETC,
+// 16:  IT_WEAPON,   32:  IT_ARMOR,    64:   IT_CARD,   128:  IT_PETEGG,
+// 256: IT_PETARMOR, 512: IT_UNKNOWN2, 1024: IT_AMMO,   2048: IT_DELAYCONSUME
+// 262144: IT_CASH
+show_picker_item_type: 112
+
+// Method of distribution when item party share is enabled in a party:
+// 0: Normal (item goes to a random party member)
+// 1: Item Share is disabled for non-mob drops (player/pet drops)
+// 2: Round Robin (items are distributed evenly and in order among members)
+// 3: 1+2
+party_item_share_type: 0
+
+// Is exp/item sharing disabled for idle members in the party?
+// Set to 0, or the amount of seconds (NOT milliseconds) that need to pass before considering
+// a character idle.
+// Characters in a chat/vending are always considered idle.
+// A character's idle status is reset upon item use/skill use/attack (auto attack counts too)/movement.
+idle_no_share: 0
+
+// Give additional experience bonus per party-member involved on even-share parties (excluding yourself)?
+// ex. If set to 10, an even-share party of 5 people will receive +40% exp (4 members * 10% exp):
+//     140% party experience in total, so each member receives 140%/5 = 28% exp (instead of 20%).
+party_even_share_bonus: 0
+
+// Display party name regardless if player is in a guild.
+// Official servers do not display party name unless the user is in a guild. (Note 1)
+display_party_name: false
diff --git a/conf/map/battle/pet.conf b/conf/map/battle/pet.conf
new file mode 100644
index 000000000..6dfe5076c
--- /dev/null
+++ b/conf/map/battle/pet.conf
@@ -0,0 +1,100 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+// Battle (Pet) Configuration File
+//=========================================================================
+// Note 1: Value is a config switch (true/false)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary)
+//=========================================================================
+
+// Rate for catching pets (Note 2)
+pet_catch_rate: 100
+
+// Can you name a pet more then once? (Note 1)
+pet_rename: false
+
+// The rate a pet will get friendly by feeding it. (Note 2)
+pet_friendly_rate: 100
+
+// The rate at which a pet will become hungry. (Note 2)
+pet_hungry_delay_rate: 100
+
+// If your pet is hungry by how much will the friendlyness decrease by. (Default is 5)
+// Note: The friendlyness is 0-1000 total, at 0 the pet runs away.
+pet_hungry_friendly_decrease: 5
+
+// Does the pet need its equipment before it does its skill? (Note 1)
+pet_equip_required: true
+
+// When the master attacks a monster, whether or not the pet will also attack. (Note 1)
+pet_attack_support: false
+
+// When the master receives damage from the monster, whether or not the pet attacks back. (Note 1)
+pet_damage_support: false
+
+// Minimum intimacy necessary for a pet to support their master. Default is 900
+// (intimacy goes from 0 to 1000). At this minimum, support rate is 50% of pet's normal value.
+// At max (1000) support rate is 150%.
+pet_support_min_friendly: 900
+
+// Same as above, but this is to use the pet_script field with official pet abilities.
+pet_equip_min_friendly: 900
+
+// Whether or not the pet's will use skills. (Note 1)
+// Note: Offensive pet skills need at least pet_attack_support or
+// pet_damage_support to work (they trigger while the pet is attacking).
+pet_status_support: false
+
+// Rate at which a pet will support it's owner in battle. (Note 2)
+// Affects pet_attack_support & pet_damage_support.
+pet_support_rate: 100
+
+// Does the pets owner receive exp from the pets damage?
+pet_attack_exp_to_master: false
+
+// The rate exp. is gained from the pet attacking monsters
+pet_attack_exp_rate: 100
+
+// Pet leveling system. Use 0 to disable (default).
+// When enabled, a pet's level is a fixed % of the master's. (Note 2)
+// If 200%, pet has double level, if 50% pet has half your level, etc.
+pet_lv_rate: 0
+
+// When pet leveling is enabled, what is the max stats for pets?
+pet_max_stats: 99
+
+// When pet leveling is enabled, these are the imposed caps on
+// min/max damage. Note that these only cap atk1 and atk2, if you
+// enable pet_str, their max damage is then their base_atk + pet_max_atk2
+pet_max_atk1: 500
+pet_max_atk2: 1000
+
+// Are pets disabled during Guild Wars?
+// If set to true, pets are automatically returned to egg when entering castles during WoE times
+// and hatching is forbidden within as well.
+pet_disable_in_gvg: false
diff --git a/conf/map/battle/player.conf b/conf/map/battle/player.conf
new file mode 100644
index 000000000..e478a92a1
--- /dev/null
+++ b/conf/map/battle/player.conf
@@ -0,0 +1,215 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+// Battle (Player) Configuration File
+//=========================================================================
+// Note 1: Value is a config switch (true/false)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field.
+//=========================================================================
+
+// Players' maximum HP rate? (Default is 100)
+hp_rate: 100
+
+// Players' maximum SP rate? (Default is 100)
+sp_rate: 100
+
+// Whether or not cards and attributes of the left hand are applied to the right hand attack (Note 1)
+// (It is true on official servers)
+left_cardfix_to_right: true
+
+// The amount of HP a player will respawn with, 0 is default.
+// (Unit is in percentage of total HP, 100 is full heal of HP, 0 is respawn with 1HP total.)
+restart_hp_rate: 0
+
+// The amount of SP a player will respawn with, 0 is default.
+// (Unit is in percentage of total SP, 100 is full heal of SP, 0 is respawn with 1SP total.)
+restart_sp_rate: 0
+
+// Can a normal player by-pass the skill tree? (Note 1)
+player_skillfree: false
+
+// When set to true, forces skill points gained from 1st class to be put into 1st class
+// skills, and forces novice skill points to be put into the basic skill. (Note 1)
+player_skillup_limit: true
+
+// Quest skills can be learned? (Note 1)
+// Setting this to true can open an exploit on your server!
+quest_skill_learn: false
+
+// When skills are reset, quest skills are reset as well? (Note 1)
+// Setting this to true can open an exploit on your server!
+// NOTE: If you have quest_skill_learn set to true, quest skills are always reset.
+quest_skill_reset: false
+
+// You must have basic skills to be able to sit, trade, form a party or create a chatroom? (Note 1)
+basic_skill_check: true
+
+// When teleporting, or spawning to a map, how long before a monster sees you if you don't move? (time is in milliseconds)
+// That is, when you go to a map and don't move, how long before the monsters will notice you.
+// When moving, attacking or doing similar actions, the effect ends instantly.
+// Value is also affected by 'invincible_time_inc' mapflag
+player_invincible_time: 5000
+
+// When set to true, it prevent portal abuse for avoid hits. Official value is false.
+fix_warp_hit_delay_abuse: false
+
+// The time interval for HP to restore naturally. (in milliseconds)
+natural_healhp_interval: 6000
+
+// The time interval for SP to restore naturally. (in milliseconds)
+natural_healsp_interval: 8000
+
+// Automatic healing skill's time interval. (in milliseconds)
+natural_heal_skill_interval: 10000
+
+// The maximum weight for a character to carry when the character stops healing naturally. (in %)
+natural_heal_weight_rate: 50
+
+// Maximum atk speed. (Default 190, Highest allowed 199)
+max_aspd: 190
+
+// Same as max_aspd, but for 3rd classes. (Default 193, Highest allowed 199)
+max_third_aspd: 193
+
+// Maximum walk speed rate (200 would be capped to twice the normal speed)
+max_walk_speed: 300
+
+// Maximum HP. (Default is 1000000)
+max_hp: 1000000
+
+// Maximum SP. (Default is 1000000)
+max_sp: 1000000
+
+// Max limit of char stats. (agi, str, etc.)
+max_parameter: 99
+
+// Same as max_parameter, but for 3rd classes.
+max_third_parameter: 130
+
+// Same as max_parameter, but for extend classes (Ex. Super Novice, Kagero/Oboro, Rebellion).
+max_extended_parameter: 125
+
+// Same as max_parameter, but for baby classes.
+max_baby_parameter: 80
+
+// Same as max_parameter, but for baby 3rd's.
+max_baby_third_parameter: 117
+
+// Max armor def/mdef
+// NOTE: This setting have no effect if server is run on Renewal Mode (RENEWAL)
+// NOTE: does not affects skills and status effects like Mental Strength
+// If weapon_defense_type is non-zero, it won't apply to max def.
+// If magic_defense_type is non-zero, it won't apply to max mdef.
+max_def: 99
+
+// Def to Def2 conversion bonus. If the armor def/mdef exceeds max_def,
+// the remaining is converted to vit def/int mdef using this multiplier
+// (eg: if set to 10, every armor point above the max becomes 10 vit defense points)
+over_def_bonus: 0
+
+// Max weight carts can hold.
+max_cart_weight: 8000
+
+// Prevent logout of players after being hit for how long (in ms, 0 disables)?
+prevent_logout: 10000
+
+// Display the drained hp/sp values from normal attacks? (Ie: Hunter Fly card)
+show_hp_sp_drain: false
+
+// Display the gained hp/sp values from killing mobs? (Ie: Sky Deleter Card)
+show_hp_sp_gain: true
+
+// Show the critical bonus for katar class weapon in player status window?  On
+// official server, the critical bonus from katar class weapon isn't display.
+// (Default: false)
+show_katar_crit_bonus: false
+
+// If set, when A accepts B as a friend, B will also be added to A's friend
+// list, otherwise, only A appears in B's friend list.
+// NOTE: this setting only enables friend auto-adding; auto-deletion does not work yet
+friend_auto_add: true
+
+// Are simultaneous trade/party/guild invite requests automatically rejected?
+invite_request_check: true
+
+// Players' will drop a 'Skull' when killed?
+// 0 = Disabled
+// 1 = Dropped only in PvP maps
+// 2 = Dropped in all situations
+bone_drop: 0
+
+// Do mounted (on Peco) characters increase their size
+// 0 = no
+// 1 = only Normal Classes on Peco have Big Size
+// 2 = only Baby Classes on Peco have Medium Size
+// 3 = both Normal Classes on Peco have Big Size
+//	and Baby Classes on Peco have Medium Size
+character_size: 0
+
+// Idle characters can receive autoloot?
+// Set to the time in seconds where an idle character will stop receiving
+// items from Autoloot (0: disabled).
+idle_no_autoloot: 0
+
+// Minimum distance a vending/chat room must be from a NPC in order to be placed
+// Default: 3 (0: disabled).
+min_npc_vendchat_distance: 3
+
+// If min_npc_vendchat_distance is enabled,
+// can players vend/chat room nearby hidden npc? (Ie: FAKE_NPC/HIDDEN_WARP_NPC)
+vendchat_near_hiddennpc: false
+
+// Super Novice's fury is enabled to increments of 10%, such as at 10.0%, 20.0% - 80.0%, 90.0%
+// Changing snovice_call_type config to 1 enables its use at 0%, for maxed super novices.
+// default: 0
+snovice_call_type: 0
+
+// How the server should measure the character's idle time? (Note 3)
+// 0x001 - Walk Request
+// 0x002 - UseSkillToID Request ( targetted skill use attempt )
+// 0x004 - UseSkillToPos Request ( aoe skill use attempt )
+// 0x008 - UseItem Request ( including equip/unequip )
+// 0x010 - Attack Request
+// 0x020 - Chat Request ( whisper, party, guild, bg, etca )
+// 0x040 - Sit/Standup Request
+// 0x080 - Emotion Request
+// 0x100 - DropItem Request
+// 0x200 - @/#Command Request
+// Please note that at least 1 option has to be enabled.
+// Be mindful that the more options used, the easier it becomes to cheat features that rely on idletime (e.g. checkidle()).
+// Default: walk ( 0x1 ) + useskilltoid ( 0x2 ) + useskilltopos ( 0x4 ) + useitem ( 0x8 ) + attack ( 0x10 ) = 0x1F
+idletime_criteria: 0x1F
+
+// Can players get ATK/DEF from refinements on costume/shadow equips?
+// Default: yes (Official behavior not known)
+costume_refine_def: true
+shadow_refine_def: true
+shadow_refine_atk: true
+
+// Keep player facing direction after warping?
+// Default: false (on official servers players always faces north)
+player_warp_keep_direction: true
diff --git a/conf/map/battle/skill.conf b/conf/map/battle/skill.conf
new file mode 100644
index 000000000..8d7c9df44
--- /dev/null
+++ b/conf/map/battle/skill.conf
@@ -0,0 +1,326 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+// Battle (Skill) Configuration File
+//=========================================================================
+// Note 1: Value is a config switch (true/false)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary)
+//=========================================================================
+
+// The rate of time it takes to cast a spell (Note 2, 0 = No casting time)
+casting_rate: 100
+
+// Delay time after casting (Note 2)
+delay_rate: 100
+
+// Does the delay time depend on the caster's DEX and/or AGI? (Note 1)
+// Note: On Official servers, neither Dex nor Agi affect delay time
+delay_dependon_dex: false
+delay_dependon_agi: false
+
+// Minimum allowed delay for ANY skills after casting (in milliseconds) (Note 1)
+// Note: Setting this to anything above 0 can stop speedhacks.
+min_skill_delay_limit: 100
+
+// This delay is the min 'can't walk delay' of all skills.
+// NOTE: Do not set this too low, if a character starts moving too soon after
+// doing a skill, the client will not update this, and the player/mob will
+// appear to "teleport" afterwards.
+default_walk_delay: 300
+
+//Completely disable skill delay of the following types (Note 3)
+//NOTE: By default mobs don't have the skill delay as specified in the skill
+//  database, but follow their own 'reuse' skill delay which is specified on
+//  the mob skill db. When set, the delay for all skills become
+//  min_skill_delay_limit.
+no_skill_delay: 2
+
+// At what dex does the cast time become zero (instant cast)?
+castrate_dex_scale: 150
+
+// How much (dex*2+int) does variable cast turns zero?
+vcast_stat_scale: 530
+
+// What level of leniency should the skill system give for skills when
+// accounting attack motion (ASPD) for casting skills (Note 2, between 0 and 300)
+//
+// NOTE: Setting this to 100% may cause some issues with valid skills not being cast.
+//       The time difference between client and server varies so allowing 90% leniency
+//       should be enough to forgive very small margins of error.
+skill_amotion_leniency: 90
+
+// Will normal attacks be able to ignore the delay after skills? (Note 1)
+skill_delay_attack_enable: true
+
+// Range added to skills after their cast time finishes.
+// Decides how far away the target can walk away after the skill began casting before the skill fails.
+// 0 disables this range checking (default)
+skill_add_range: 0
+
+// If the target moves out of range while casting, do we take the items and SP for the skill anyway? (Note 1)
+skill_out_range_consume: false
+
+// Does the distance between caster and target define if the skill is a ranged skill? (Note 3)
+// If set, when the distance between caster and target is greater than 3 the skill is considered long-range, otherwise it's a melee range.
+// If not set, then the range is determined by the skill's range (if it is above 5, the skill is ranged).
+// Default 14 (mobs + pets + homun)
+skillrange_by_distance: 14
+
+// Should the equipped weapon's range override the skill's range defined in the skill_db for most weapon-based skills? (Note 3)
+// NOTE: Skills affected by this option are those whose range in the skill_db are negative. By default always the skill range is used.
+// Note that if you want all monster skills to have a range of 9 you need to set monster_ai&0x400.
+skillrange_from_weapon: 0
+
+// Should a check on the caster's status be performed in all skill attacks?
+// When set to true, meteors, storm gust and any other ground skills will have 
+// no effect while the caster is unable to fight (eg: stunned).
+skill_caster_check: true
+
+// Should ground placed skills be removed as soon as the caster dies? (Note 3)
+clear_skills_on_death: 0
+
+// Should ground placed skills be removed when the caster changes maps? (Note 3)
+clear_skills_on_warp: 15
+
+//Setting this to true will override the target mode of ground-based skills with the flag 0x01 to "No Enemies"
+//The two skills affected by default are Pneuma and Safety Wall (if set to true, those two skills will not protect everyone, but only allies)
+//See db/skill_unit_db.txt for more info.
+defunit_not_enemy: false
+
+// Do skills do at least 'hits' damage when they don't miss/are blocked?
+//(for example, will firebolts always do "number of bolts" damage versus plants?)
+//Values (add as appropriate): 1 for weapon-based attacks, 2 for magic attacks, 4 for misc attacks.
+skill_min_damage: 6
+
+// The delay rate of monk's combo (Note 2)
+combo_delay_rate: 100
+
+// Use alternate auto Counter Attack Skill Type? (Note 3)
+// For those characters on which it is set, 100% Critical,
+// Otherwise it disregard DEF and HIT+20, CRI*2
+auto_counter_type: 15
+
+// Can ground skills be placed on top of each other? (Note 3)
+// By default, skills with UF_NOREITERATION set cannot be stacked on top of
+// other skills, this setting will override that. (skill_unit_db)
+skill_reiteration: 0
+
+// Can ground skills NOT be placed underneath/near players/monsters? (Note 3)
+// If set, only skills with UF_NOFOOTSET set will be affected (skill_unit_db)
+skill_nofootset: 1
+
+// Should traps (hunter traps + quagmire) change their target to "all" inside gvg/pvp grounds? (Note 3)
+// Default on official servers: true for player-traps
+gvg_traps_target_all: 1
+
+// Some traps settings (add as necessary):
+// 1: Traps are invisible to those who come into view of it. When unset, all traps are visible at all times.
+//    (Invisible traps can be revealed through Hunter's Detecting skill)
+traps_setting: 0
+
+// Restrictions applied to the Alchemist's Summon Flora skill (add as necessary)
+// 1: Enable players to damage the floras outside of versus grounds.
+// 2: Disable having different types out at the same time
+//    (eg: forbid summoning anything except hydras when there's already
+//     one hydra out)
+summon_flora_setting: 3
+
+// When songs are canceled, terminated or the character goes out of the
+// area of effect, there's an additional effect that lasts for 20 seconds
+// Should that time be reset for each song?
+// 0: No, you must recast the song AFTER those 20 seconds to have the effect again (Aegis)
+// 1: Yes, recasting songs reset the 20 seconds timer (eathena)
+song_timer_reset: 0
+
+// Whether placed down skills will check walls (Note 1)
+// (Makes it so that Storm Gust/Lord of Vermillion/etc when cast next to a wall, won't hit on the other side)
+skill_wall_check: true
+
+// When cloaking, Whether the wall is checked or not. (Note 1)
+// Note: When the skill does not checks for walls, you will always be considered
+//  as if you had a wall-next to you (you always get the wall-based speed).
+//  Add the settings as required, being hit always uncloaks you.
+// 0 = doesn't check for walls
+// 1 = Check for walls
+// 2 = Cloaking is not canceled when attacking.
+// 4 = Cloaking is not canceled when using skills
+player_cloak_check_type: 1
+monster_cloak_check_type: 4
+
+// Can't place unlimited land skills at the same time (Note 3)
+land_skill_limit: 9
+
+//Determines which kind of skill-failed messages should be sent:
+// 0 - Enable by default
+// 1 - Disable all skill-failed messages.
+// 2 - Disable skill-failed messages due to can-act delays.
+// 4 - Disable failed message from Snatcher
+// 8 - Disable failed message from Envenom
+display_skill_fail: 0
+
+// Can a player in chat room (in-game), be warped by a warp portal? (Note 1)
+chat_warpportal: false
+
+// What should the wizard's "Sense" skill display on the defense fields?
+// 0: Do not show defense
+// 1: Base defense [RE default]
+// 2: Vit/Int defense
+// 3: Both (the addition of both)
+sense_type: 1
+
+// Which finger offensive style will be used?
+// 0 = Aegis style (single multi-hit attack)
+// 1 = Athena style (multiple consecutive attacks)
+finger_offensive_type: 0
+
+// Grandcross Settings (Don't mess with these)
+// If set to false, hit interval is increased based on the amount of mobs standing on the same cell
+// (means that when there's stacked mobs in the same cell, they won't receive all hits)
+gx_allhit: false
+
+// Grandcross display type (Default 1)
+// 0: Yellow character
+// 1: White character
+gx_disptype: 1
+
+// Max Level Difference for Devotion
+devotion_level_difference: 10
+
+// If false than you can use the ensemble skills alone. (Note 1)
+player_skill_partner_check: true
+
+// Remove trap type
+// 0 = Aegis system : Returns 1 'Trap' item
+// 1 = Athena system : Returns all items used to deploy the trap
+skill_removetrap_type: 0
+
+// Does using bow to do a backstab give a 50% damage penalty? (Note 1)
+backstab_bow_penalty: true
+
+// How many times you could try to steal from a mob.
+// Note: It helps to avoid stealing exploit on monsters with few rare items
+// Use 0 to disable (max allowed value is 255)
+skill_steal_max_tries: 0
+
+// Can Rogues plagiarize advanced job skills
+// 0 = no restriction
+// 1 = only stalker may plagiarize advanced skills
+// 2 = advanced skills cannot be plagiarized by anyone
+// Official servers setting: 2
+copyskill_restrict: 2
+
+// Does Berserk/Frenzy cancel other self-buffs when used?
+berserk_cancels_buffs: false
+
+// Level and Strength of "MVP heal". When someone casts a heal of this level or
+// above, the heal formula is bypassed and this value is used instead.
+max_heal: 9999
+max_heal_lv: 11
+
+// Emergency Recall Guild Skill setting (add as appropriate).
+// Note that for the skill to be usable at all,
+// you need at least one of 1/2 and 4/8
+// 1: Skill is usable outside of woe.
+// 2: Skill is usable during woe.
+// 4: Skill is usable outside of GvG grounds
+// 8: Skill is usable on GvG grounds
+//16: Disable skill from "nowarpto" maps
+//    (it will work on GVG castles even if they are set to nowarpto, though)
+emergency_call: 11
+
+// Guild Aura Skills setting (add as appropriate).
+// (This affects GD_LEADERSHIP, GD_GLORYWOUNDS, GD_SOULCOLD and GD_HAWKEYES)
+// Note that for the skill to be usable at all,
+// you need at least one of 1/2 and 4/8
+// 1: Skill works outside of woe.
+// 2: Skill works during woe.
+// 4: Skill works outside of GvG grounds
+// 8: Skill works on GvG grounds
+//16: Disable skill from affecting Guild Master
+guild_aura: 31
+
+// Allows players to skip menu when casting Teleport level 1
+// Menu contains two options. "Random" and "Cancel"
+skip_teleport_lv1_menu: false
+
+// Allow use of SG skills without proper day (Sun/Moon/Star) ?
+allow_skill_without_day: false
+
+// Allow use of ES-type magic on players?
+allow_es_magic_player: false
+
+// Miracle of the Sun, Moon and Stars skill ratio (100% = 10000)
+sg_miracle_skill_ratio: 2
+
+// Miracle of the Sun, Moon and Stars skill duration in milliseconds
+sg_miracle_skill_duration: 3600000
+
+// Angel of the Sun, Moon and Stars skill ratio (100% = 10000)
+sg_angel_skill_ratio: 10
+
+// Skills that bHealPower has effect on
+// 1: Heal, 2: Sanctuary, 4: Potion Pitcher, 8: Slim Pitcher, 16: Apple of Idun
+skill_add_heal_rate: 7
+
+// Whether the damage of EarthQuake with a single target on screen is able to be reflected.
+// Note: On official server, EQ is reflectable when there is only one target on the screen,
+//	 which might be an exploit to hunt the MVPs.
+eq_single_target_reflectable: true
+
+// On official server, you will receive damage from Reflection and some Tarot Card even in invincible status.
+// When this setting is enabled, it allows you to immune to all kinds of damage, including those stated previous.
+// (The number will show but no actual damage will be done)
+invincible_nodamage: false
+
+// Dancing Weapon Switch
+// On official server, a fix is in place that prevents the switching of weapons to cancel songs.
+// Default: true
+dancing_weaponswitch_fix: true
+
+// Skill Trap Type (GvG)
+// 0: (official) Traps in GvG only make player stop moving after its walk path is complete, and it activates other traps on the way.
+// 1: Traps in GvG make player stop moving right when stepping over it.
+skill_trap_type: 0
+
+// Max Possible Level of Monster skills
+// Note: If your MVPs are too tough, reduce it to 10.
+mob_max_skilllvl: 100
+
+// Area of Bowling Bash chain reaction
+// 0: Use official gutter line system
+// 1: Gutter line system without demi gutter bug
+// 2-20: Area around caster (2 = 5x5, 3 = 7x7, 4 = 9x9, ..., 20 = 41x41)
+// Note: If you knock the target out of the area it will only be hit once and won't do splash damage
+bowling_bash_area: 0
+
+// On official servers, Storm Gust consists of 81 units that all deal 3x3 splash damage "away from center". Due to
+// south-western cells being processed first, this usually leads to a knockback to the northeast. Knockback at the
+// edges will be away from SG. Knockback direction can also be influenced by Ganbantein and Land Protector. If you
+// punch a hole into SG it will for example create a "suck in" effect.
+// If you disable this setting, the knockback direction will be completely random (eAthena style).
+stormgust_knockback: true
diff --git a/conf/map/battle/status.conf b/conf/map/battle/status.conf
new file mode 100644
index 000000000..37b2e013d
--- /dev/null
+++ b/conf/map/battle/status.conf
@@ -0,0 +1,47 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2016  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+// Battle (Status) Configuration File
+//=========================================================================
+// Note 1: Value is a config switch (true/false)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary)
+//=========================================================================
+
+// Should skill casting be canceled when inflicted by curse/stun/sleep/etc (includes silence) (Note 3)?
+status_cast_cancel: 0
+
+// Adjustment for the natural rate of resistance from status changes.
+// If 50, status defense is halved, and you need twice as much stats to block
+// them (eg: 200 vit to completely block stun)
+pc_status_def_rate: 100
+mob_status_def_rate: 100
+
+// Maximum resistance to status changes. (100 = 100%)
+// NOTE: Cards and equipment can go over this limit, so it only applies to natural resist.
+pc_max_status_def: 100
+mob_max_status_def: 100
diff --git a/conf/readme.txt b/conf/readme.txt
index 3323b5689..28ff254b6 100644
--- a/conf/readme.txt
+++ b/conf/readme.txt
@@ -9,12 +9,12 @@ How does this work?
 -------------------------------------------------------------------------------
 
 Place only the settings you have changed in the import files.
-For example, if you want to change a value in conf/battle/exp.conf:
+For example, if you want to change a value in conf/map/battle/exp.conf:
 
 	// Rate at which exp. is given. (Note 2)
 	base_exp_rate: 700
 
-You could instead copy the setting into conf/import/battle_conf.txt,
+You could instead copy the setting into conf/import/battle.conf,
 and you'll eliminate any problems updating in the future.
 
 Neat, isn't it?
diff --git a/src/common/HPM.c b/src/common/HPM.c
index 8e0bbe992..17dc4408e 100644
--- a/src/common/HPM.c
+++ b/src/common/HPM.c
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2013-2015  Hercules Dev Team
+ * Copyright (C) 2013-2016  Hercules Dev Team
  *
  * Hercules is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -858,6 +858,52 @@ bool hplugins_get_battle_conf(const char *w1, int *value)
 	return true;
 }
 
+/**
+ * Parses battle config entries registered by plugins.
+ *
+ * @param config   The configuration file to parse.
+ * @param filename Path to configuration file.
+ * @param imported Whether the current config is imported from another file.
+ * @retval false in case of error.
+ */
+bool hplugins_parse_battle_conf(const struct config_t *config, const char *filename, bool imported)
+{
+	const struct config_setting_t *setting = NULL;
+	int i, val, type;
+	char str[1024];
+	bool retval = true;
+
+	nullpo_retr(false, config);
+
+	for (i = 0; i < VECTOR_LENGTH(HPM->config_listeners[HPCT_BATTLE]); i++) {
+		const struct HPConfListenStorage *entry = &VECTOR_INDEX(HPM->config_listeners[HPCT_BATTLE], i);
+		const char *config_name = entry->key;
+		if ((setting = libconfig->lookup(config, config_name)) == NULL) {
+			if (!imported) {
+				ShowWarning("Missing configuration '%s' in file %s!\n", config_name, filename);
+				retval = false;
+			}
+			continue;
+		}
+
+		switch ((type = config_setting_type(setting))) {
+		case CONFIG_TYPE_INT:
+			val = libconfig->setting_get_int(setting);
+			break;
+		case CONFIG_TYPE_BOOL:
+			val = libconfig->setting_get_bool(setting);
+			break;
+		default: // Unsupported type
+			ShowWarning("Setting %s has unsupported type %d, ignoring...\n", config_name, type);
+			retval = false;
+			continue;
+		}
+		sprintf(str, "%d", val); // FIXME: Remove this when support to int's as value is added
+		entry->parse_func(config_name, str);
+	}
+	return retval;
+}
+
 /**
  * Helper to destroy an interface's hplugin_data store and release any owned memory.
  *
@@ -1074,6 +1120,7 @@ void hpm_defaults(void)
 	HPM->parse_packets = hplugins_parse_packets;
 	HPM->load_sub = NULL;
 	HPM->parseConf = hplugins_parse_conf;
+	HPM->parse_battle_conf = hplugins_parse_battle_conf;
 	HPM->getBattleConf = hplugins_get_battle_conf;
 	HPM->DataCheck = HPM_DataCheck;
 	HPM->datacheck_init = HPM_datacheck_init;
diff --git a/src/common/HPM.h b/src/common/HPM.h
index 0b1275fde..104522090 100644
--- a/src/common/HPM.h
+++ b/src/common/HPM.h
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2013-2015  Hercules Dev Team
+ * Copyright (C) 2013-2016  Hercules Dev Team
  *
  * Hercules is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -65,7 +65,9 @@
 
 #endif // WIN32
 
+/* Forward Declarations */
 struct HPMHooking_core_interface;
+struct config_t;
 
 struct hplugin {
 	DLL dll;
@@ -155,6 +157,7 @@ struct HPM_interface {
 	void *(*import_symbol) (char *name, unsigned int pID);
 	void (*share) (void *value, const char *name);
 	void (*config_read) (void);
+	bool (*parse_battle_conf) (const struct config_t *config, const char *filename, bool imported);
 	char *(*pid2name) (unsigned int pid);
 	unsigned char (*parse_packets) (int fd, int packet_id, enum HPluginPacketHookingPoints point);
 	void (*load_sub) (struct hplugin *plugin);
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 8d4aa317f..3f916eb42 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -3611,7 +3611,7 @@ ACMD(reloadbattleconf)
 	struct Battle_Config prev_config;
 	memcpy(&prev_config, &battle_config, sizeof(prev_config));
 
-	battle->config_read(map->BATTLE_CONF_FILENAME);
+	battle->config_read(map->BATTLE_CONF_FILENAME, false);
 	if (prev_config.feature_roulette == 0 && battle_config.feature_roulette == 1 && !clif->parse_roulette_db())
 		battle_config.feature_roulette = 0;
 
diff --git a/src/map/battle.c b/src/map/battle.c
index 908f0364b..c564b81cd 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -41,6 +41,7 @@
 #include "map/status.h"
 #include "common/HPM.h"
 #include "common/cbasetypes.h"
+#include "common/conf.h"
 #include "common/ers.h"
 #include "common/memmgr.h"
 #include "common/nullpo.h"
@@ -7018,7 +7019,7 @@ static const struct battle_data {
 	{ "show_steal_in_same_party",           &battle_config.show_steal_in_same_party,        0,      0,      1,              },
 	{ "party_hp_mode",                      &battle_config.party_hp_mode,                   0,      0,      1,              },
 	{ "show_party_share_picker",            &battle_config.party_show_share_picker,         1,      0,      1,              },
-	{ "show_picker.item_type",              &battle_config.show_picker_item_type,           112,    0,      INT_MAX,        },
+	{ "show_picker_item_type",              &battle_config.show_picker_item_type,           112,    0,      INT_MAX,        },
 	{ "party_update_interval",              &battle_config.party_update_interval,           1000,   100,    INT_MAX,        },
 	{ "party_item_share_type",              &battle_config.party_share_type,                0,      0,      1|2|3,          },
 	{ "attack_attr_none",                   &battle_config.attack_attr_none,                ~BL_PC, BL_NUL, BL_ALL,         },
@@ -7177,14 +7178,14 @@ static const struct battle_data {
 	{ "display_status_timers",              &battle_config.display_status_timers,           1,      0,      1,              },
 	{ "skill_add_heal_rate",                &battle_config.skill_add_heal_rate,             7,      0,      INT_MAX,        },
 	{ "eq_single_target_reflectable",       &battle_config.eq_single_target_reflectable,    1,      0,      1,              },
-	{ "invincible.nodamage",                &battle_config.invincible_nodamage,             0,      0,      1,              },
+	{ "invincible_nodamage",                &battle_config.invincible_nodamage,             0,      0,      1,              },
 	{ "mob_slave_keep_target",              &battle_config.mob_slave_keep_target,           0,      0,      1,              },
 	{ "autospell_check_range",              &battle_config.autospell_check_range,           0,      0,      1,              },
 	{ "knockback_left",                     &battle_config.knockback_left,                  1,      0,      1,              },
 	{ "client_reshuffle_dice",              &battle_config.client_reshuffle_dice,           0,      0,      1,              },
 	{ "client_sort_storage",                &battle_config.client_sort_storage,             0,      0,      1,              },
-	{ "feature.buying_store",               &battle_config.feature_buying_store,            1,      0,      1,              },
-	{ "feature.search_stores",              &battle_config.feature_search_stores,           1,      0,      1,              },
+	{ "features/buying_store",              &battle_config.feature_buying_store,            1,      0,      1,              },
+	{ "features/search_stores",             &battle_config.feature_search_stores,           1,      0,      1,              },
 	{ "searchstore_querydelay",             &battle_config.searchstore_querydelay,         10,      0,      INT_MAX,        },
 	{ "searchstore_maxresults",             &battle_config.searchstore_maxresults,         30,      1,      INT_MAX,        },
 	{ "display_party_name",                 &battle_config.display_party_name,              0,      0,      1,              },
@@ -7204,7 +7205,7 @@ static const struct battle_data {
 	{ "atcommand_max_stat_bypass",          &battle_config.atcommand_max_stat_bypass,       0,      0,      100,            },
 	{ "skill_amotion_leniency",             &battle_config.skill_amotion_leniency,          90,     0,      300             },
 	{ "mvp_tomb_enabled",                   &battle_config.mvp_tomb_enabled,                1,      0,      1               },
-	{ "feature.atcommand_suggestions",      &battle_config.atcommand_suggestions_enabled,   0,      0,      1               },
+	{ "features/atcommand_suggestions",     &battle_config.atcommand_suggestions_enabled,   0,      0,      1               },
 	{ "min_npc_vendchat_distance",          &battle_config.min_npc_vendchat_distance,       3,      0,      100             },
 	{ "vendchat_near_hiddennpc",            &battle_config.vendchat_near_hiddennpc,         0,      0,      1               },
 	{ "atcommand_mobinfo_type",             &battle_config.atcommand_mobinfo_type,          0,      0,      1               },
@@ -7225,8 +7226,8 @@ static const struct battle_data {
 	{ "client_accept_chatdori",             &battle_config.client_accept_chatdori,          0,      0,      INT_MAX,        },
 	{ "snovice_call_type",                  &battle_config.snovice_call_type,               0,      0,      1,              },
 	{ "guild_notice_changemap",             &battle_config.guild_notice_changemap,          2,      0,      2,              },
-	{ "feature.banking",                    &battle_config.feature_banking,                 1,      0,      1,              },
-	{ "feature.auction",                    &battle_config.feature_auction,                 0,      0,      2,              },
+	{ "features/banking",                   &battle_config.feature_banking,                 1,      0,      1,              },
+	{ "features/auction",                   &battle_config.feature_auction,                 0,      0,      2,              },
 	{ "idletime_criteria",                  &battle_config.idletime_criteria,            0x25,      1,      INT_MAX,        },
 	{ "mon_trans_disable_in_gvg",           &battle_config.mon_trans_disable_in_gvg,        0,      0,      1,              },
 	{ "case_sensitive_aegisnames",          &battle_config.case_sensitive_aegisnames,       1,      0,      1,              },
@@ -7238,7 +7239,7 @@ static const struct battle_data {
 	{ "monster_chase_refresh",              &battle_config.mob_chase_refresh,               1,      0,      30,             },
 	{ "mob_icewall_walk_block",             &battle_config.mob_icewall_walk_block,          75,     0,      255,            },
 	{ "boss_icewall_walk_block",            &battle_config.boss_icewall_walk_block,         0,      0,      255,            },
-	{ "feature.roulette",                   &battle_config.feature_roulette,                1,      0,      1,              },
+	{ "features/roulette",                  &battle_config.feature_roulette,                1,      0,      1,              },
 	{ "show_monster_hp_bar",                &battle_config.show_monster_hp_bar,             1,      0,      1,              },
 	{ "fix_warp_hit_delay_abuse",           &battle_config.fix_warp_hit_delay_abuse,        0,      0,      1,              },
 	{ "costume_refine_def",                 &battle_config.costume_refine_def,              1,      0,      1,              },
@@ -7413,28 +7414,36 @@ static int Hercules_report_timer(int tid, int64 tick, int id, intptr_t data) {
 }
 #endif
 
-int battle_set_value(const char* w1, const char* w2)
+bool battle_set_value_sub(int index, int value)
 {
-	int val = config_switch(w2);
+	Assert_retr(false, index >= 0);
+	if (value < battle_data[index].min || value > battle_data[index].max) {
+		ShowWarning("Value for setting '%s': %d is invalid (min:%d max:%d)! Defaulting to %d...\n",
+				battle_data[index].str, value, battle_data[index].min, battle_data[index].max, battle_data[index].defval);
+		value = battle_data[index].defval;
+	}
+	*battle_data[index].val = value;
+	return true;
+}
+
+bool battle_set_value(const char *param, const char *value)
+{
+	int val;
 	int i;
 
-	nullpo_retr(1, w1);
-	nullpo_retr(1, w2);
-	ARR_FIND(0, ARRAYLENGTH(battle_data), i, strcmpi(w1, battle_data[i].str) == 0);
-	if (i == ARRAYLENGTH(battle_data)) {
-		if( HPM->parseConf(w1,w2,HPCT_BATTLE) ) /* if plugin-owned, succeed */
-			return 1;
-		return 0; // not found
-	}
+	nullpo_retr(false, param);
+	nullpo_retr(false, value);
 
-	if (val < battle_data[i].min || val > battle_data[i].max)
-	{
-		ShowWarning("Value for setting '%s': %s is invalid (min:%i max:%i)! Defaulting to %i...\n", w1, w2, battle_data[i].min, battle_data[i].max, battle_data[i].defval);
-		val = battle_data[i].defval;
+	val = config_switch(value);
+
+	ARR_FIND(0, ARRAYLENGTH(battle_data), i, strcmpi(param, battle_data[i].str) == 0);
+	if (i == ARRAYLENGTH(battle_data)) {
+		if (HPM->parseConf(param, value, HPCT_BATTLE)) /* if plugin-owned, succeed */
+			return true;
+		return false; // not found
 	}
 
-	*battle_data[i].val = val;
-	return 1;
+	return battle->config_set_value_sub(i, val);
 }
 
 bool battle_get_value(const char *w1, int *value)
@@ -7485,36 +7494,36 @@ void battle_adjust_conf(void) {
 
 #if PACKETVER < 20100427
 	if( battle_config.feature_buying_store ) {
-		ShowWarning("conf/battle/feature.conf buying_store is enabled but it requires PACKETVER 2010-04-27 or newer, disabling...\n");
+		ShowWarning("conf/map/battle/feature.conf buying_store is enabled but it requires PACKETVER 2010-04-27 or newer, disabling...\n");
 		battle_config.feature_buying_store = 0;
 	}
 #endif
 
 #if PACKETVER < 20100803
 	if( battle_config.feature_search_stores ) {
-		ShowWarning("conf/battle/feature.conf search_stores is enabled but it requires PACKETVER 2010-08-03 or newer, disabling...\n");
+		ShowWarning("conf/map/battle/feature.conf search_stores is enabled but it requires PACKETVER 2010-08-03 or newer, disabling...\n");
 		battle_config.feature_search_stores = 0;
 	}
 #endif
 
 #if PACKETVER < 20130724
 	if( battle_config.feature_banking ) {
-		ShowWarning("conf/battle/feature.conf banking is enabled but it requires PACKETVER 2013-07-24 or newer, disabling...\n");
+		ShowWarning("conf/map/battle/feature.conf banking is enabled but it requires PACKETVER 2013-07-24 or newer, disabling...\n");
 		battle_config.feature_banking = 0;
 	}
 #endif
 
 #if PACKETVER < 20141022
 	if( battle_config.feature_roulette ) {
-		ShowWarning("conf/battle/feature.conf roulette is enabled but it requires PACKETVER 2014-10-22 or newer, disabling...\n");
+		ShowWarning("conf/map/battle/feature.conf roulette is enabled but it requires PACKETVER 2014-10-22 or newer, disabling...\n");
 		battle_config.feature_roulette = 0;
 	}
 #endif
 
 #if PACKETVER > 20120000 && PACKETVER < 20130515 /* exact date (when it started) not known */
 	if( battle_config.feature_auction == 1 ) {
-		ShowWarning("conf/battle/feature.conf:feature.auction is enabled but it is not stable on PACKETVER "EXPAND_AND_QUOTE(PACKETVER)", disabling...\n");
-		ShowWarning("conf/battle/feature.conf:feature.auction change value to '2' to silence this warning and maintain it enabled\n");
+		ShowWarning("conf/map/battle/feature.conf:features/auction is enabled but it is not stable on PACKETVER "EXPAND_AND_QUOTE(PACKETVER)", disabling...\n");
+		ShowWarning("conf/map/battle/feature.conf:features/auction change value to '2' to silence this warning and maintain it enabled\n");
 		battle_config.feature_auction = 0;
 	}
 #endif
@@ -7525,48 +7534,78 @@ void battle_adjust_conf(void) {
 #endif
 }
 
-int battle_config_read(const char* cfgName)
+/**
+ * Dynamically reads battle configuration and initializes required variables.
+ *
+ * @param filename Path to configuration file.
+ * @param imported Whether the current config is imported from another file.
+ * @retval false in case of error.
+ */
+bool battle_config_read(const char *filename, bool imported)
 {
-	FILE* fp;
-	static int count = 0;
+	struct config_t config;
+	const struct config_setting_t *setting = NULL;
+	int i;
+	const char *import = NULL;
+	bool retval = true;
+
+	nullpo_retr(false, filename);
 
-	nullpo_ret(cfgName);
+	if (!libconfig->load_file(&config, filename))
+		return false; // Error message is already shown by libconfig->load_file()
 
-	if (count == 0)
+	if (!imported)
 		battle->config_set_defaults();
 
-	count++;
+	for (i = 0; i < ARRAYLENGTH(battle_data); i++) {
+		int type, val;
+		char config_name[256];
+		safesnprintf(config_name, sizeof config_name, "battle_configuration/%s", battle_data[i].str);
 
-	fp = fopen(cfgName,"r");
-	if (fp == NULL)
-		ShowError("File not found: %s\n", cfgName);
-	else
-	{
-		char line[1024], w1[1024], w2[1024];
-		while(fgets(line, sizeof(line), fp))
-		{
-			if (line[0] == '/' && line[1] == '/')
-				continue;
-			if (sscanf(line, "%1023[^:]:%1023s", w1, w2) != 2)
-				continue;
-			if (strcmpi(w1, "import") == 0)
-				battle->config_read(w2);
-			else
-			if (battle->config_set_value(w1, w2) == 0)
-				ShowWarning("Unknown setting '%s' in file %s\n", w1, cfgName);
+		if ((setting = libconfig->lookup(&config, config_name)) == NULL) {
+			if (!imported) {
+				ShowWarning("Missing configuration '%s' in file %s!\n", config_name, filename);
+				retval = false;
+			}
+			continue;
 		}
 
-		fclose(fp);
+		switch ((type = config_setting_type(setting))) {
+		case CONFIG_TYPE_INT:
+			val = libconfig->setting_get_int(setting);
+			break;
+		case CONFIG_TYPE_BOOL:
+			val = libconfig->setting_get_bool(setting);
+			break;
+		default: // Unsupported type
+			ShowWarning("Setting %s has unsupported type %d, ignoring...\n", config_name, type);
+			retval = false;
+			continue;
+		}
+
+		if (!battle->config_set_value_sub(i, val))
+			retval = false;
 	}
 
-	count--;
+	if (!HPM->parse_battle_conf(&config, filename, imported))
+		retval = false;
+
+	// import should overwrite any previous configuration, so it should be called last
+	if (libconfig->lookup_string(&config, "import", &import) == CONFIG_TRUE) {
+		if (strcmp(import, filename) == 0 || strcmp(import, map->BATTLE_CONF_FILENAME) == 0) {
+			ShowWarning("battle_config_read: Loop detected! Skipping 'import'...\n");
+		} else {
+			if (!battle->config_read(import, true))
+				retval = false;
+		}
+	}
 
-	if (count == 0) {
+	libconfig->destroy(&config);
+	if (!imported) {
 		battle->config_adjust();
 		clif->bc_ready();
 	}
-
-	return 0;
+	return retval;
 }
 
 void do_init_battle(bool minimal) {
@@ -7645,6 +7684,7 @@ void battle_defaults(void) {
 	battle->calc_drain = battle_calc_drain;
 	battle->config_read = battle_config_read;
 	battle->config_set_defaults = battle_set_defaults;
+	battle->config_set_value_sub = battle_set_value_sub;
 	battle->config_set_value = battle_set_value;
 	battle->config_get_value = battle_get_value;
 	battle->config_adjust = battle_adjust_conf;
diff --git a/src/map/battle.h b/src/map/battle.h
index e04a713ae..ebfa0e305 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2012-2015  Hercules Dev Team
+ * Copyright (C) 2012-2016  Hercules Dev Team
  * Copyright (C)  Athena Dev Teams
  *
  * Hercules is free software: you can redistribute it and/or modify
@@ -663,10 +663,11 @@ struct battle_interface {
 	int (*adjust_skill_damage) (int m, unsigned short skill_id);
 	int64 (*add_mastery) (struct map_session_data *sd,struct block_list *target,int64 dmg,int type);
 	int (*calc_drain) (int64 damage, int rate, int per);
-	/* - battle_config                           */
-	int (*config_read) (const char *cfgName);
+	/* battle_config */
+	bool (*config_read) (const char *filename, bool imported);
 	void (*config_set_defaults) (void);
-	int (*config_set_value) (const char *w1, const char *w2);
+	bool (*config_set_value_sub) (int index, int value);
+	bool (*config_set_value) (const char *param, const char *value);
 	bool (*config_get_value) (const char *w1, int *value);
 	void (*config_adjust) (void);
 	/* ----------------------------------------- */
diff --git a/src/map/map.c b/src/map/map.c
index 17c025ff3..40bcd9263 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -6367,7 +6367,7 @@ int do_init(int argc, char *argv[])
 	map->INTER_CONF_NAME         = aStrdup("conf/common/inter-server.conf");
 	map->LOG_CONF_NAME           = aStrdup("conf/map/logs.conf");
 	map->MAP_CONF_NAME           = aStrdup("conf/map/map-server.conf");
-	map->BATTLE_CONF_FILENAME    = aStrdup("conf/battle.conf");
+	map->BATTLE_CONF_FILENAME    = aStrdup("conf/map/battle.conf");
 	map->ATCOMMAND_CONF_FILENAME = aStrdup("conf/atcommand.conf");
 	map->SCRIPT_CONF_NAME        = aStrdup("conf/map/script.conf");
 	map->MSG_CONF_NAME           = aStrdup("conf/messages.conf");
@@ -6402,6 +6402,7 @@ int do_init(int argc, char *argv[])
 		CHECK_OLD_LOCAL_CONF("conf/import/log_conf.txt", "conf/import/logs.conf");
 		CHECK_OLD_LOCAL_CONF("conf/import/script_conf.txt", "conf/import/script.conf");
 		CHECK_OLD_LOCAL_CONF("conf/import/packet_conf.txt", "conf/import/socket.conf");
+		CHECK_OLD_LOCAL_CONF("conf/import/battle_conf.txt", "conf/import/battle.conf");
 
 #undef CHECK_OLD_LOCAL_CONF
 		}
@@ -6432,7 +6433,7 @@ int do_init(int argc, char *argv[])
 				chrif->setip(ip_str);
 		}
 
-		battle->config_read(map->BATTLE_CONF_FILENAME);
+		battle->config_read(map->BATTLE_CONF_FILENAME, false);
 		atcommand->msg_read(map->MSG_CONF_NAME, false);
 		map->inter_config_read(map->INTER_CONF_NAME, false);
 		logs->config_read(map->LOG_CONF_NAME, false);
@@ -6596,7 +6597,7 @@ void map_defaults(void) {
 	map->INTER_CONF_NAME="conf/common/inter-server.conf";
 	map->LOG_CONF_NAME="conf/map/logs.conf";
 	map->MAP_CONF_NAME = "conf/map/map-server.conf";
-	map->BATTLE_CONF_FILENAME = "conf/battle.conf";
+	map->BATTLE_CONF_FILENAME = "conf/map/battle.conf";
 	map->ATCOMMAND_CONF_FILENAME = "conf/atcommand.conf";
 	map->SCRIPT_CONF_NAME = "conf/map/script.conf";
 	map->MSG_CONF_NAME = "conf/messages.conf";
diff --git a/tools/configconverter.pl b/tools/configconverter.pl
index 669e3741c..4fafd1f64 100755
--- a/tools/configconverter.pl
+++ b/tools/configconverter.pl
@@ -531,6 +531,409 @@ my @defaults = (
 			import                   => {parse => \&parsecfg_string,    print => \&printcfg_nil,     path => "", default => "conf/import/packet_conf.txt"},
 		}
 	},
+	{
+		files => ['battle.conf', 'battle/battle.conf', 'battle/client.conf', 'battle/drops.conf', 'battle/exp.conf', 'battle/gm.conf', 'battle/guild.conf', 'battle/battleground.conf', 'battle/items.conf', 'battle/monster.conf', 'battle/party.conf', 'battle/pet.conf', 'battle/homunc.conf', 'battle/player.conf', 'battle/skill.conf', 'battle/status.conf', 'battle/feature.conf', 'battle/misc.conf', 'import/battle_conf.txt'],
+		settings => {
+			bg_flee_penalty                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battleground:", default => 20},
+			bg_update_interval                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battleground:", default => 1000},
+			'feature.buying_store'            => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "feature:features/buying_store", default => "true"},
+			'feature.search_stores'           => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "feature:features/search_stores", default => "true"},
+			'feature.atcommand_suggestions'   => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "feature:features/atcommand_suggestions", default => "false"},
+			'feature.banking'                 => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "feature:features/banking", default => "true"},
+			'feature.auction'                 => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "feature:features/auction", default => "false"},
+			'feature.roulette'                => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "feature:features/roulette", default => "false"},
+			atcommand_spawn_quantity_limit    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "gm:", default => 100},
+			atcommand_slave_clone_limit       => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "gm:", default => 25},
+			partial_name_scan                 => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "gm:", default => "true"},
+			atcommand_max_stat_bypass         => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "gm:", default => "false"},
+			ban_hack_trade                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "gm:", default => 5},
+			atcommand_mobinfo_type            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "gm:", default => 0},
+			gm_ignore_warpable_area           => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "gm:", default => 2},
+			atcommand_levelup_events          => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "gm:", default => "false"},
+			guild_emperium_check              => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "guild:", default => "true"},
+			guild_exp_limit                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "guild:", default => 50},
+			guild_max_castles                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "guild:", default => 0},
+			guild_skill_relog_delay           => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "guild:", default => "false"},
+			castle_defense_rate               => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "guild:", default => 100},
+			gvg_flee_penalty                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "guild:", default => 20},
+			require_glory_guild               => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "guild:", default => "false"},
+			max_guild_alliance                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "guild:", default => 3},
+			guild_notice_changemap            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "guild:", default => 2},
+			guild_castle_invite               => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "guild:", default => "false"},
+			guild_castle_expulsion            => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "guild:", default => "false"},
+			hom_setting                       => {parse => \&parsecfg_int,       print => \&printcfg_hexint, path => "homunc:", default => 0x1D},
+			homunculus_friendly_rate          => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "homunc:", default => 100},
+			hom_rename                        => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "homunc:", default => "false"},
+			hvan_explosion_intimate           => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "homunc:", default => 45000},
+			homunculus_show_growth            => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "homunc:", default => "true"},
+			homunculus_autoloot               => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "homunc:", default => "true"},
+			homunculus_auto_vapor             => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "homunc:", default => "true"},
+			homunculus_max_level              => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "homunc:", default => 99},
+			homunculus_S_max_level            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "homunc:", default => 150},
+			enable_baseatk                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 9},
+			enable_perfect_flee               => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 1},
+			enable_critical                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 17},
+			mob_critical_rate                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 100},
+			critical_rate                     => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 100},
+			attack_walk_delay                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 15},
+			pc_damage_walk_delay_rate         => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 20},
+			damage_walk_delay_rate            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 100},
+			multihit_delay                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 80},
+			player_damage_delay_rate          => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 100},
+			undead_detect_type                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 0},
+			attribute_recover                 => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "battle:", default => "false"},
+			min_hitrate                       => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 5},
+			max_hitrate                       => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 100},
+			agi_penalty_type                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 1},
+			agi_penalty_target                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 1},
+			agi_penalty_count                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 3},
+			agi_penalty_num                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 10},
+			vit_penalty_type                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 1},
+			vit_penalty_target                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 1},
+			vit_penalty_count                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 3},
+			vit_penalty_num                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 5},
+			weapon_defense_type               => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 0},
+			magic_defense_type                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 0},
+			attack_direction_change           => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 0},
+			attack_attr_none                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 14},
+			equip_natural_break_rate          => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 0},
+			equip_self_break_rate             => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 100},
+			equip_skill_break_rate            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 100},
+			delay_battle_damage               => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "battle:", default => "true"},
+			arrow_decrement                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "battle:", default => 1},
+			autospell_check_range             => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "battle:", default => "false"},
+			knockback_left                    => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "battle:", default => "true"},
+			snap_dodge                        => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "battle:", default => "false"},
+			packet_obfuscation                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "client:", default => 1},
+			min_chat_delay                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "client:", default => 0},
+			min_hair_style                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "client:", default => 0},
+			max_hair_style                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "client:", default => 29},
+			min_hair_color                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "client:", default => 0},
+			max_hair_color                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "client:", default => 8},
+			min_cloth_color                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "client:", default => 0},
+			max_cloth_color                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "client:", default => 4},
+			min_body_style                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "client:", default => 0},
+			max_body_style                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "client:", default => 4},
+			hide_woe_damage                   => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "client:", default => "true"},
+			pet_hair_style                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "client:", default => 100},
+			area_size                         => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "client:", default => 14},
+			max_walk_path                     => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "client:", default => 17},
+			max_lv                            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "client:", default => 99},
+			aura_lv                           => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "client:", default => 99},
+			client_limit_unit_lv              => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "client:", default => 0},
+			wedding_modifydisplay             => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "client:", default => "false"},
+			save_clothcolor                   => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "client:", default => "true"},
+			save_body_style                   => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "client:", default => "false"},
+			wedding_ignorepalette             => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "client:", default => "false"},
+			xmas_ignorepalette                => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "client:", default => "false"},
+			summer_ignorepalette              => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "client:", default => "false"},
+			hanbok_ignorepalette              => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "client:", default => "false"},
+			display_version                   => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "client:", default => "false"},
+			display_hallucination             => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "client:", default => "true"},
+			display_status_timers             => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "client:", default => "true"},
+			client_reshuffle_dice             => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "client:", default => "true"},
+			client_sort_storage               => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "client:", default => "false"},
+			client_accept_chatdori            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "client:", default => 0},
+			client_emblem_max_blank_percent   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "client:", default => 100},
+			item_auto_get                     => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "drops:", default => "false"},
+			flooritem_lifetime                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 60000},
+			item_first_get_time               => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 3000},
+			item_second_get_time              => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 1000},
+			item_third_get_time               => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 1000},
+			mvp_item_first_get_time           => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 10000},
+			mvp_item_second_get_time          => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 10000},
+			mvp_item_third_get_time           => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 2000},
+			item_rate_common                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 100},
+			item_rate_common_boss             => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 100},
+			item_drop_common_min              => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 1},
+			item_drop_common_max              => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 10000},
+			item_rate_heal                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 100},
+			item_rate_heal_boss               => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 100},
+			item_drop_heal_min                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 1},
+			item_drop_heal_max                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 10000},
+			item_rate_use                     => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 100},
+			item_rate_use_boss                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 100},
+			item_drop_use_min                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 1},
+			item_drop_use_max                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 10000},
+			item_rate_equip                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 100},
+			item_rate_equip_boss              => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 100},
+			item_drop_equip_min               => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 1},
+			item_drop_equip_max               => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 10000},
+			item_rate_card                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 100},
+			item_rate_card_boss               => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 100},
+			item_drop_card_min                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 1},
+			item_drop_card_max                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 10000},
+			item_rate_mvp                     => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 100},
+			item_drop_mvp_min                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 1},
+			item_drop_mvp_max                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 10000},
+			item_rate_adddrop                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 100},
+			item_drop_add_min                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 1},
+			item_drop_add_max                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 10000},
+			item_rate_treasure                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 100},
+			item_drop_treasure_min            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 1},
+			item_drop_treasure_max            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 10000},
+			item_logarithmic_drops            => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "drops:", default => "false"},
+			drop_rate0item                    => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "drops:", default => "false"},
+			drops_by_luk                      => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 0},
+			drops_by_luk2                     => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 0},
+			alchemist_summon_reward           => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 1},
+			rare_drop_announce                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "drops:", default => 0},
+			base_exp_rate                     => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "exp:", default => 100},
+			job_exp_rate                      => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "exp:", default => 100},
+			multi_level_up                    => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "exp:", default => "false"},
+			max_exp_gain_rate                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "exp:", default => 0},
+			exp_calc_type                     => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "exp:", default => 0},
+			exp_bonus_attacker                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "exp:", default => 25},
+			exp_bonus_max_attacker            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "exp:", default => 12},
+			mvp_exp_rate                      => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "exp:", default => 100},
+			quest_exp_rate                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "exp:", default => 100},
+			heal_exp                          => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "exp:", default => 0},
+			resurrection_exp                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "exp:", default => 0},
+			shop_exp                          => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "exp:", default => 0},
+			pvp_exp                           => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "exp:", default => "true"},
+			death_penalty_type                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "exp:", default => 1},
+			death_penalty_base                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "exp:", default => 100},
+			death_penalty_job                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "exp:", default => 100},
+			zeny_penalty                      => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "exp:", default => 0},
+			disp_experience                   => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "exp:", default => "false"},
+			disp_zeny                         => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "exp:", default => "false"},
+			use_statpoint_table               => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "exp:", default => "true"},
+			vending_max_value                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "items:", default => 1000000000},
+			vending_over_max                  => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "items:", default => "true"},
+			vending_tax                       => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "items:", default => 200},
+			buyer_name                        => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "items:", default => "true"},
+			weapon_produce_rate               => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "items:", default => 100},
+			potion_produce_rate               => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "items:", default => 100},
+			produce_item_name_input           => {parse => \&parsecfg_int,       print => \&printcfg_hexint, path => "items:", default => 0x03},
+			dead_branch_active                => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "items:", default => "true"},
+			random_monster_checklv            => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "items:", default => "false"},
+			ignore_items_gender               => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "items:", default => "true"},
+			item_check                        => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "items:", default => "false"},
+			item_use_interval                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "items:", default => 100},
+			cashfood_use_interval             => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "items:", default => 60000},
+			gtb_sc_immunity                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "items:", default => 50},
+			autospell_stacking                => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "items:", default => "false"},
+			item_restricted_consumption_type  => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "items:", default => "true"},
+			item_enabled_npc                  => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "items:", default => "true"},
+			unequip_restricted_equipment      => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "items:", default => 0},
+			pk_mode                           => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "misc:", default => 0},
+			manner_system                     => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "misc:", default => 31},
+			pk_min_level                      => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "misc:", default => 55},
+			pk_level_range                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "misc:", default => 0},
+			skill_log                         => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "misc:", default => "false"},
+			battle_log                        => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "misc:", default => "false"},
+			etc_log                           => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "misc:", default => "false"},
+			warp_point_debug                  => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "misc:", default => "false"},
+			night_at_start                    => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "misc:", default => "false"},
+			day_duration                      => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "misc:", default => 0},
+			night_duration                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "misc:", default => 0},
+			duel_allow_pvp                    => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "misc:", default => "false"},
+			duel_allow_gvg                    => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "misc:", default => "false"},
+			duel_allow_teleport               => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "misc:", default => "false"},
+			duel_autoleave_when_die           => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "misc:", default => "true"},
+			duel_time_interval                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "misc:", default => 60},
+			duel_only_on_same_map             => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "misc:", default => "false"},
+			official_cell_stack_limit         => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "misc:", default => 1},
+			custom_cell_stack_limit           => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "misc:", default => 1},
+			check_occupied_cells              => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "misc:", default => "true"},
+			at_mapflag                        => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "misc:", default => "false"},
+			at_timeout                        => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "misc:", default => 0},
+			auction_feeperhour                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "misc:", default => 12000},
+			auction_maximumprice              => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "misc:", default => 500000000},
+			searchstore_querydelay            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "misc:", default => 10},
+			searchstore_maxresults            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "misc:", default => 30},
+			cashshop_show_points              => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "misc:", default => "false"},
+			mail_show_status                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "misc:", default => 0},
+			mon_trans_disable_in_gvg          => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "misc:", default => "false"},
+			case_sensitive_aegisnames         => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "misc:", default => "true"},
+			mvp_hp_rate                       => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 100},
+			monster_hp_rate                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 100},
+			monster_max_aspd                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 199},
+			monster_ai                        => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 0},
+			monster_chase_refresh             => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 3},
+			mob_warp                          => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 0},
+			mob_active_time                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 0},
+			boss_active_time                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 0},
+			view_range_rate                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 100},
+			chase_range_rate                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 100},
+			monster_active_enable             => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "monster:", default => "true"},
+			override_mob_names                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 0},
+			monster_damage_delay_rate         => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 100},
+			monster_loot_type                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 0},
+			mob_skill_rate                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 100},
+			mob_skill_delay                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 100},
+			mob_count_rate                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 100},
+			mob_spawn_delay                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 100},
+			plant_spawn_delay                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 100},
+			boss_spawn_delay                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 100},
+			no_spawn_on_player                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 0},
+			force_random_spawn                => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "monster:", default => "false"},
+			slaves_inherit_mode               => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 2},
+			slaves_inherit_speed              => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 3},
+			summons_trigger_autospells        => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "monster:", default => "true"},
+			retaliate_to_master               => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "monster:", default => "true"},
+			mob_changetarget_byskill          => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "monster:", default => "false"},
+			monster_class_change_full_recover => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "monster:", default => "true"},
+			show_mob_info                     => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 0},
+			zeny_from_mobs                    => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "monster:", default => "false"},
+			mobs_level_up                     => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "monster:", default => "false"},
+			mobs_level_up_exp_rate            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 1},
+			dynamic_mobs                      => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "monster:", default => "true"},
+			mob_remove_damaged                => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "monster:", default => "true"},
+			mob_remove_delay                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 300000},
+			mob_npc_event_type                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 1},
+			ksprotection                      => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 0},
+			mob_slave_keep_target             => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "monster:", default => "true"},
+			mvp_tomb_enabled                  => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "monster:", default => "true"},
+			show_monster_hp_bar               => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "monster:", default => "true"},
+			mob_size_influence                => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "monster:", default => "false"},
+			mob_icewall_walk_block            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 220},
+			boss_icewall_walk_block           => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "monster:", default => 1},
+			show_steal_in_same_party          => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "party:", default => "false"},
+			party_update_interval             => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "party:", default => 1000},
+			party_hp_mode                     => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "party:", default => 0},
+			show_party_share_picker           => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "party:", default => "true"},
+			'show_picker.item_type'           => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "party:show_picker_item_type", default => 112},
+			party_item_share_type             => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "party:", default => 0},
+			idle_no_share                     => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "party:", default => 0},
+			party_even_share_bonus            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "party:", default => 0},
+			display_party_name                => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "party:", default => "false"},
+			pet_catch_rate                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "pet:", default => 100},
+			pet_rename                        => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "pet:", default => "false"},
+			pet_friendly_rate                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "pet:", default => 100},
+			pet_hungry_delay_rate             => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "pet:", default => 100},
+			pet_hungry_friendly_decrease      => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "pet:", default => 5},
+			pet_equip_required                => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "pet:", default => "true"},
+			pet_attack_support                => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "pet:", default => "false"},
+			pet_damage_support                => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "pet:", default => "false"},
+			pet_support_min_friendly          => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "pet:", default => 900},
+			pet_equip_min_friendly            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "pet:", default => 900},
+			pet_status_support                => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "pet:", default => "false"},
+			pet_support_rate                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "pet:", default => 100},
+			pet_attack_exp_to_master          => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "pet:", default => "false"},
+			pet_attack_exp_rate               => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "pet:", default => 100},
+			pet_lv_rate                       => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "pet:", default => 0},
+			pet_max_stats                     => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "pet:", default => 99},
+			pet_max_atk1                      => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "pet:", default => 500},
+			pet_max_atk2                      => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "pet:", default => 1000},
+			pet_disable_in_gvg                => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "pet:", default => "false"},
+			hp_rate                           => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 100},
+			sp_rate                           => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 100},
+			left_cardfix_to_right             => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "player:", default => "true"},
+			restart_hp_rate                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 0},
+			restart_sp_rate                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 0},
+			player_skillfree                  => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "player:", default => "false"},
+			player_skillup_limit              => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "player:", default => "true"},
+			quest_skill_learn                 => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "player:", default => "false"},
+			quest_skill_reset                 => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "player:", default => "false"},
+			basic_skill_check                 => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "player:", default => "true"},
+			player_invincible_time            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 5000},
+			fix_warp_hit_delay_abuse          => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "player:", default => "false"},
+			natural_healhp_interval           => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 6000},
+			natural_healsp_interval           => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 8000},
+			natural_heal_skill_interval       => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 10000},
+			natural_heal_weight_rate          => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 50},
+			max_aspd                          => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 190},
+			max_third_aspd                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 193},
+			max_walk_speed                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 300},
+			max_hp                            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 1000000},
+			max_sp                            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 1000000},
+			max_parameter                     => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 99},
+			max_third_parameter               => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 130},
+			max_extended_parameter            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 125},
+			max_baby_parameter                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 80},
+			max_baby_third_parameter          => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 117},
+			max_def                           => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 99},
+			over_def_bonus                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 0},
+			max_cart_weight                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 8000},
+			prevent_logout                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 10000},
+			show_hp_sp_drain                  => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "player:", default => "false"},
+			show_hp_sp_gain                   => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "player:", default => "true"},
+			show_katar_crit_bonus             => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "player:", default => "false"},
+			friend_auto_add                   => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "player:", default => "true"},
+			invite_request_check              => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "player:", default => "true"},
+			bone_drop                         => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 0},
+			character_size                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 0},
+			idle_no_autoloot                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 0},
+			min_npc_vendchat_distance         => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 3},
+			vendchat_near_hiddennpc           => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "player:", default => "false"},
+			snovice_call_type                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "player:", default => 0},
+			idletime_criteria                 => {parse => \&parsecfg_int,       print => \&printcfg_hexint, path => "player:", default => 0x1F},
+			costume_refine_def                => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "player:", default => "true"},
+			shadow_refine_def                 => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "player:", default => "true"},
+			shadow_refine_atk                 => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "player:", default => "true"},
+			player_warp_keep_direction        => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "player:", default => "true"},
+			casting_rate                      => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 100},
+			delay_rate                        => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 100},
+			delay_dependon_dex                => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "false"},
+			delay_dependon_agi                => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "false"},
+			min_skill_delay_limit             => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 100},
+			default_walk_delay                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 300},
+			no_skill_delay                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 2},
+			castrate_dex_scale                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 150},
+			vcast_stat_scale                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 530},
+			skill_amotion_leniency            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 90},
+			skill_delay_attack_enable         => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "true"},
+			skill_add_range                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 0},
+			skill_out_range_consume           => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "false"},
+			skillrange_by_distance            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 14},
+			skillrange_from_weapon            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 0},
+			skill_caster_check                => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "true"},
+			clear_skills_on_death             => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 0},
+			clear_skills_on_warp              => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 15},
+			defunit_not_enemy                 => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "false"},
+			skill_min_damage                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 6},
+			combo_delay_rate                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 100},
+			auto_counter_type                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 15},
+			skill_reiteration                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 0},
+			skill_nofootset                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 1},
+			gvg_traps_target_all              => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 1},
+			traps_setting                     => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 0},
+			summon_flora_setting              => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 3},
+			song_timer_reset                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 0},
+			skill_wall_check                  => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "true"},
+			player_cloak_check_type           => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 1},
+			monster_cloak_check_type          => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 4},
+			land_skill_limit                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 9},
+			display_skill_fail                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 0},
+			chat_warpportal                   => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "false"},
+			sense_type                        => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 1},
+			finger_offensive_type             => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 0},
+			gx_allhit                         => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "false"},
+			gx_disptype                       => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 1},
+			devotion_level_difference         => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 10},
+			player_skill_partner_check        => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "true"},
+			skill_removetrap_type             => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 0},
+			backstab_bow_penalty              => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "true"},
+			skill_steal_max_tries             => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 0},
+			copyskill_restrict                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 2},
+			berserk_cancels_buffs             => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "false"},
+			max_heal                          => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 9999},
+			max_heal_lv                       => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 11},
+			emergency_call                    => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 11},
+			guild_aura                        => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 31},
+			skip_teleport_lv1_menu            => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "false"},
+			allow_skill_without_day           => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "false"},
+			allow_es_magic_player             => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "false"},
+			sg_miracle_skill_ratio            => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 2},
+			sg_miracle_skill_duration         => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 3600000},
+			sg_angel_skill_ratio              => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 10},
+			skill_add_heal_rate               => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 7},
+			eq_single_target_reflectable      => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "true"},
+			'invincible.nodamage'             => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "false"},
+			dancing_weaponswitch_fix          => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "true"},
+			skill_trap_type                   => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 0},
+			mob_max_skilllvl                  => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 100},
+			bowling_bash_area                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "skill:", default => 0},
+			stormgust_knockback               => {parse => \&parsecfg_bool,      print => \&printcfg_bool,   path => "skill:", default => "true"},
+			status_cast_cancel                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "status:", default => 0},
+			pc_status_def_rate                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "status:", default => 100},
+			mob_status_def_rate               => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "status:", default => 100},
+			pc_max_status_def                 => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "status:", default => 100},
+			mob_max_status_def                => {parse => \&parsecfg_int,       print => \&printcfg_int,    path => "status:", default => 100},
+			import                            => {parse => \&parsecfg_stringarr, print => \&printcfg_nil,    path => "", default => ['conf/battle/battle.conf', 'conf/battle/client.conf', 'conf/battle/drops.conf', 'conf/battle/exp.conf', 'conf/battle/gm.conf', 'conf/battle/guild.conf', 'conf/battle/battleground.conf', 'conf/battle/items.conf', 'conf/battle/monster.conf', 'conf/battle/party.conf', 'conf/battle/pet.conf', 'conf/battle/homunc.conf', 'conf/battle/player.conf', 'conf/battle/skill.conf', 'conf/battle/status.conf', 'conf/battle/feature.conf', 'conf/battle/misc.conf', 'conf/import/battle_conf.txt']},
+		}
+	},
 );
 
 for (@ARGV) {
-- 
cgit v1.2.3-70-g09d2