Merge branch 'master' of https://github.com/HerculesWS/Hercules

27 files changed, 57 insertions, 97 deletions

diff --git a/conf/inter-server.conf b/conf/inter-server.conf
index 70bf80e5c..523437007 100644
--- a/conf/inter-server.conf
+++ b/conf/inter-server.conf
@@ -56,6 +56,18 @@ log_db_db: ragnarok
 log_codepage:
 log_login_db: loginlog
 
+// == MySQL Reconnect Settings
+// ===========================
+// - mysql_reconnect_type
+// - 1: when mysql disconnects during runtime, the server tries to reconnect mysql_reconnect_count times and,
+// -- if unsuccessful, the server is shut down
+// - 2: when mysql disconnects during runtime it tries to reconnect indefinitely
+mysql_reconnect_type:2
+// - mysql_reconnect_count
+// - number of reconnect attempts the server should do when the database disconnects during runtime
+// - only used when mysql_reconnect_type is 1
+mysql_reconnect_count:1
+
 // DO NOT CHANGE ANYTHING BEYOND THIS LINE UNLESS YOU KNOW YOUR DATABASE DAMN WELL
 // this is meant for people who KNOW their stuff, and for some reason want to change their
 // database layout. [CLOWNISIUS]
diff --git a/conf/mapflag/battleground.txt b/conf/mapflag/battleground.txt
index 86dcf95f0..f7404c139 100644
--- a/conf/mapflag/battleground.txt
+++ b/conf/mapflag/battleground.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Battleground map setting.
 //===== By: ==================================================
 //= Epoque
 //===== Current Version: =====================================
 //= 1.0a
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Defines a Battleground map.
 //= Additional parameter '2' shows scoreboard.
diff --git a/conf/mapflag/gvg.txt b/conf/mapflag/gvg.txt
index 31430d856..055a1d733 100644
--- a/conf/mapflag/gvg.txt
+++ b/conf/mapflag/gvg.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Guild versus Guild mode.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Players can attack other guilds, and will have their guild
 //= icons shown. WoE damage reductions will also take place.
diff --git a/conf/mapflag/jail.txt b/conf/mapflag/jail.txt
index 024a5cd6f..0a8b00846 100644
--- a/conf/mapflag/jail.txt
+++ b/conf/mapflag/jail.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Jail.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= pvp: Turns on PvP mode
 //= pvp_noparty: Can't attack player in same party
diff --git a/conf/mapflag/night.txt b/conf/mapflag/night.txt
index 4584f068f..c3e8a47fe 100644
--- a/conf/mapflag/night.txt
+++ b/conf/mapflag/night.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Night mode.
 //===== By: ==================================================
 //= Skotlex
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Enables night mode effects.
 //===== Additional Comments: ================================= 
diff --git a/conf/mapflag/nightmare.txt b/conf/mapflag/nightmare.txt
index 9c7d3f8f7..106ee665a 100644
--- a/conf/mapflag/nightmare.txt
+++ b/conf/mapflag/nightmare.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Nightmare mode.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Players drop items/equipment on death.
 //= pvp_nightmaredrop	id,type,percent
diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt
index f9eea4890..a05c37df5 100644
--- a/conf/mapflag/nobranch.txt
+++ b/conf/mapflag/nobranch.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Disable Dead Branch use.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= HerculesDev Team
 //===== Current Version: =====================================
 //= 1.8
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Disables the following items:
 //=   Dead Branch (604), Bloody Branch (12103),
diff --git a/conf/mapflag/noexp.txt b/conf/mapflag/noexp.txt
index 4161a923c..0b6fe20c6 100644
--- a/conf/mapflag/noexp.txt
+++ b/conf/mapflag/noexp.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Disable EXP gain.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.7
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Same as 'nobaseexp' and 'nojobexp' combined.
 //===== Additional Comments: ================================= 
diff --git a/conf/mapflag/noicewall.txt b/conf/mapflag/noicewall.txt
index 392bf16e0..5b6e6ad12 100644
--- a/conf/mapflag/noicewall.txt
+++ b/conf/mapflag/noicewall.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Disable Ice Wall.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.8
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Blocks usage of WZ_ICEWALL.
 //===== Additional Comments: ================================= 
diff --git a/conf/mapflag/noloot.txt b/conf/mapflag/noloot.txt
index adab17a5d..380dc506c 100644
--- a/conf/mapflag/noloot.txt
+++ b/conf/mapflag/noloot.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Disable monster drops.
 //===== By: ==================================================
 //= Epoque
 //===== Current Version: =====================================
 //= 1.0a
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Same as 'nomobloot' and 'nomvploot' combined.
 //===== Additional Comments: ================================= 
diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt
index 12321f7c1..dbb35a164 100644
--- a/conf/mapflag/nomemo.txt
+++ b/conf/mapflag/nomemo.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Disable Warp Portal memory.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.8b
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Prevents players from using /memo on a map.
 //= Also disables marriage warp skills.
diff --git a/conf/mapflag/nopenalty.txt b/conf/mapflag/nopenalty.txt
index 2517a3759..083d86105 100644
--- a/conf/mapflag/nopenalty.txt
+++ b/conf/mapflag/nopenalty.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Disable death penalty.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Same as 'noexppenalty' and 'nozenypenalty' combined.
 //===== Additional Comments: ================================= 
diff --git a/conf/mapflag/nopvp.txt b/conf/mapflag/nopvp.txt
index 3bb9d681a..9f876c49b 100644
--- a/conf/mapflag/nopvp.txt
+++ b/conf/mapflag/nopvp.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Disable Player versus Player mode.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.1a
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Prevents PvP mode on a map.
 //===== Additional Comments: ================================= 
diff --git a/conf/mapflag/noreturn.txt b/conf/mapflag/noreturn.txt
index da694de91..696d81460 100644
--- a/conf/mapflag/noreturn.txt
+++ b/conf/mapflag/noreturn.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Disable return warp.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.6
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Disables the following items:
 //=   Butterfly Wing (602), Siege Teleport Scroll (14591),
diff --git a/conf/mapflag/nosave.txt b/conf/mapflag/nosave.txt
index fe7e03dfa..59a59fcae 100644
--- a/conf/mapflag/nosave.txt
+++ b/conf/mapflag/nosave.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Disable auto-save.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.7
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Characters logging out on the specified map will be warped
 //= to the map specified in the last field, or "SavePoint".
diff --git a/conf/mapflag/noskill.txt b/conf/mapflag/noskill.txt
index 8a25aa137..81540b45a 100644
--- a/conf/mapflag/noskill.txt
+++ b/conf/mapflag/noskill.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Disable skill use.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Disables all skills on the map.
 //===== Additional Comments: ================================= 
diff --git a/conf/mapflag/noteleport.txt b/conf/mapflag/noteleport.txt
index 4ef0639ee..df25145d8 100644
--- a/conf/mapflag/noteleport.txt
+++ b/conf/mapflag/noteleport.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Disable teleportation.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.6a
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Disables all means of teleportation within a map.
 //= Script commands 'warp', 'areawarp', 'warpchar',
diff --git a/conf/mapflag/novending.txt b/conf/mapflag/novending.txt
index 816d52252..5f7ef8e82 100644
--- a/conf/mapflag/novending.txt
+++ b/conf/mapflag/novending.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Disable vending.
 //===== By: ==================================================
 //= Epoque
 //===== Current Version: =====================================
 //= 1.0a
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Disables skill MC_VENDING on a map.
 //===== Additional Comments: ================================= 
diff --git a/conf/mapflag/nowarp.txt b/conf/mapflag/nowarp.txt
index bc41d29a6..cfeb938a2 100644
--- a/conf/mapflag/nowarp.txt
+++ b/conf/mapflag/nowarp.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Disable warping.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Disables use of @go to a map.
 //===== Additional Comments: ================================= 
diff --git a/conf/mapflag/nowarpto.txt b/conf/mapflag/nowarpto.txt
index 0f9734799..2490b8e61 100644
--- a/conf/mapflag/nowarpto.txt
+++ b/conf/mapflag/nowarpto.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Disable warpto.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Disables use of @warp to a map.
 //===== Additional Comments: ================================= 
diff --git a/conf/mapflag/partylock.txt b/conf/mapflag/partylock.txt
index 3afda71d5..e8d7051f2 100644
--- a/conf/mapflag/partylock.txt
+++ b/conf/mapflag/partylock.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Party lock.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Blocks all party modifications on a map:
 //=   /organize, /leave, /invite, @changeleader
diff --git a/conf/mapflag/pvp.txt b/conf/mapflag/pvp.txt
index 8463b8923..4e3ca5762 100644
--- a/conf/mapflag/pvp.txt
+++ b/conf/mapflag/pvp.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Player versus Player mode.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Enables PvP on a map.
 //===== Additional Comments: ================================= 
diff --git a/conf/mapflag/pvp_noguild.txt b/conf/mapflag/pvp_noguild.txt
index 731739dd1..166b65764 100644
--- a/conf/mapflag/pvp_noguild.txt
+++ b/conf/mapflag/pvp_noguild.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Ignore guilds.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Ignores guild alliances on GvG-enabled maps.
 //===== Additional Comments: ================================= 
diff --git a/conf/mapflag/pvp_noparty.txt b/conf/mapflag/pvp_noparty.txt
index abc9529d2..bd5e866f6 100644
--- a/conf/mapflag/pvp_noparty.txt
+++ b/conf/mapflag/pvp_noparty.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Ignore parties.
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Ignores party alliances on PvP-enabled maps.
 //===== Additional Comments: ================================= 
diff --git a/conf/mapflag/reset.txt b/conf/mapflag/reset.txt
index 24adf9f3a..5354580b9 100644
--- a/conf/mapflag/reset.txt
+++ b/conf/mapflag/reset.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Enable Neuralizer use.
 //===== By: ==================================================
 //= Daegaladh
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Maps where Neuralizer (12213) can be used.
 //===== Additional Comments: ================================= 
diff --git a/conf/mapflag/restricted.txt b/conf/mapflag/restricted.txt
index f4bd6d175..9c2a44bd8 100644
--- a/conf/mapflag/restricted.txt
+++ b/conf/mapflag/restricted.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Restricted.
 //===== By: ==================================================
 //= Komurka
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Disables items configured in item_noequip.txt
 //= and skills configured in skill_nocast_db.txt.
diff --git a/conf/mapflag/town.txt b/conf/mapflag/town.txt
index 8dabb2c4a..319785524 100644
--- a/conf/mapflag/town.txt
+++ b/conf/mapflag/town.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Mapflag: Town.
 //===== By: ==================================================
 //= Epoque
 //===== Current Version: =====================================
 //= 1.0a
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Designates a map as a town, granting mailbox access.
 //===== Additional Comments: =================================