Merge branch 'master' into cell_noskill

41 files changed, 368 insertions, 134 deletions

diff --git a/conf/char/char-server.conf b/conf/char/char-server.conf
index 0f07731fb..a8918e705 100644
--- a/conf/char/char-server.conf
+++ b/conf/char/char-server.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
@@ -214,8 +214,7 @@ char_configuration: {
 	pincode: {
 		// A window is opened before you can select your character and you will have to enter a pincode by using only your mouse
 		// NOTE: Requires client 2011-03-09aragexeRE or newer.
-		// 0: disabled
-		// 1: enabled
+		// Default: true
 		enabled: true
 
 		// Request Pincode only on login or on everytime char select is accessed?
diff --git a/conf/clans.conf b/conf/clans.conf
index 85ef280fe..75cfb8984 100644
--- a/conf/clans.conf
+++ b/conf/clans.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2017  Hercules Dev Team
+//= Copyright (C) 2017-2020 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
diff --git a/conf/common/inter-server.conf b/conf/common/inter-server.conf
index cbeb6617d..7696774d6 100644
--- a/conf/common/inter-server.conf
+++ b/conf/common/inter-server.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
@@ -118,6 +118,7 @@ inter_configuration: {
 		autotrade_data_db: "autotrade_data"
 		npc_market_data_db: "npc_market_data"
 		npc_barter_data_db: "npc_barter_data"
+		npc_expanded_barter_data_db: "npc_expanded_barter_data"
 	}
 }
 
diff --git a/conf/common/map-index.conf b/conf/common/map-index.conf
new file mode 100644
index 000000000..63ee2e495
--- /dev/null
+++ b/conf/common/map-index.conf
@@ -0,0 +1,34 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2020 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 Index configuration file.
+//=========================================================================
+
+mapindex_configuration: {
+    // Full path to the map_index.txt file
+    // Default: db/map_index.txt
+    file_path: "db/map_index.txt"
+}
diff --git a/conf/common/socket.conf b/conf/common/socket.conf
index 8b8b21865..fe171336a 100644
--- a/conf/common/socket.conf
+++ b/conf/common/socket.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/global/console.conf b/conf/global/console.conf
index 84a16a7c8..4865fd9b7 100644
--- a/conf/global/console.conf
+++ b/conf/global/console.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
@@ -32,36 +32,36 @@
 //=========================================================================
 
 console: {
-	//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.
+	// 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)
+	// If redirected output contains escape sequences (color codes)
 	stdout_with_ansisequence: false
 
-	//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)
+	// 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
 
 	// [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
+	// 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/global/sql_connection.conf b/conf/global/sql_connection.conf
index 3a465afea..7a8932f33 100644
--- a/conf/global/sql_connection.conf
+++ b/conf/global/sql_connection.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/import-tmpl/battle.conf b/conf/import-tmpl/battle.conf
index 7d1d03578..7facb0c74 100644
--- a/conf/import-tmpl/battle.conf
+++ b/conf/import-tmpl/battle.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/import-tmpl/char-server.conf b/conf/import-tmpl/char-server.conf
index 4c9462bc7..b31920a94 100644
--- a/conf/import-tmpl/char-server.conf
+++ b/conf/import-tmpl/char-server.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/import-tmpl/inter-server.conf b/conf/import-tmpl/inter-server.conf
index c23143b35..7ccb2c0a3 100644
--- a/conf/import-tmpl/inter-server.conf
+++ b/conf/import-tmpl/inter-server.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/import-tmpl/login-server.conf b/conf/import-tmpl/login-server.conf
index 1c45f94f9..5e8195d34 100644
--- a/conf/import-tmpl/login-server.conf
+++ b/conf/import-tmpl/login-server.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/import-tmpl/logs.conf b/conf/import-tmpl/logs.conf
index 8f8c2ea68..d42e24dea 100644
--- a/conf/import-tmpl/logs.conf
+++ b/conf/import-tmpl/logs.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/import-tmpl/map-server.conf b/conf/import-tmpl/map-server.conf
index 4d907025e..f235a4429 100644
--- a/conf/import-tmpl/map-server.conf
+++ b/conf/import-tmpl/map-server.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/import-tmpl/script.conf b/conf/import-tmpl/script.conf
index 040245285..204d1a0c1 100644
--- a/conf/import-tmpl/script.conf
+++ b/conf/import-tmpl/script.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/import-tmpl/socket.conf b/conf/import-tmpl/socket.conf
index 7ce178140..a73aabf4f 100644
--- a/conf/import-tmpl/socket.conf
+++ b/conf/import-tmpl/socket.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/login/login-server.conf b/conf/login/login-server.conf
index a3d0b6955..a7a30c83d 100644
--- a/conf/login/login-server.conf
+++ b/conf/login/login-server.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
@@ -75,8 +75,8 @@ login_configuration: {
 		// Can you use _M/_F to make new accounts on the server?
 		new_account: true
 
-		//If new_account is enabled, minimum length to userid and passwords should be 4?
-		//Must be 'true' unless your client uses both 'Disable 4 LetterUserID/Password' Diffs
+		// If new_account is enabled, minimum length to userid and passwords should be 4?
+		// Must be 'true' unless your client uses both 'Disable 4 LetterUserID/Password' Diffs
 		new_acc_length_limit: true
 
 		// Account registration flood protection system
diff --git a/conf/map/battle.conf b/conf/map/battle.conf
index 75cf0fb49..bbcc5cd02 100644
--- a/conf/map/battle.conf
+++ b/conf/map/battle.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
@@ -76,6 +76,9 @@ battle_configuration: {
 	// Feature control (on/off) settings
 	@include "conf/map/battle/feature.conf"
 
+	// Different calculation limits
+	@include "conf/map/battle/limits.conf"
+
 	// Anything else that didn't fit anywhere else.
 	// Includes duel, day/night, mute/manner, log settings.
 	@include "conf/map/battle/misc.conf"
diff --git a/conf/map/battle/battle.conf b/conf/map/battle/battle.conf
index 4b1632e31..c85d0182d 100644
--- a/conf/map/battle/battle.conf
+++ b/conf/map/battle/battle.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/map/battle/battleground.conf b/conf/map/battle/battleground.conf
index b2a482f3d..9fe58efe0 100644
--- a/conf/map/battle/battleground.conf
+++ b/conf/map/battle/battleground.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/map/battle/client.conf b/conf/map/battle/client.conf
index b7d4ac781..5601dbc9e 100644
--- a/conf/map/battle/client.conf
+++ b/conf/map/battle/client.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
@@ -189,3 +189,16 @@ mvp_exp_reward_message: false
 // character has 0 HP when dead.
 // Default: true (Official behavior)
 display_fake_hp_when_dead: true
+
+// Send ping timer
+// For clients 20190320 Re+
+// Interval in seconds for each timer invoke.
+ping_timer_inverval: 30
+
+// Send packets timeout in seconds before ping packet can be sent.
+// For clients 20190320 Re+
+ping_time: 20
+
+// Drop or not connection after client send disconnect request packet
+// Official is false
+drop_connection_on_quit: false
diff --git a/conf/map/battle/drops.conf b/conf/map/battle/drops.conf
index eb7d94f13..bc6a226f6 100644
--- a/conf/map/battle/drops.conf
+++ b/conf/map/battle/drops.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
@@ -146,3 +146,12 @@ drops_by_luk2: 0
 // 1: Only marine spheres drop items.
 // 2: All alchemist summons drop items.
 alchemist_summon_reward: 1
+
+// The maximum number of full iterations that server can do when dropping an item with options.
+// When picking random options for a dropped item, it does lots of iterations to choose the option to be set,
+// this value limits the number of iterations to avoid making the server hang in a long loop.
+option_drop_max_loop: 10
+
+// Does autoloot take into account player bonuses and penalties? (Note 1)
+// If RENEWAL_DROP, Bubble Gum, or any other modifiers are active autoloot will take them into account.
+autoloot_adjust: false
diff --git a/conf/map/battle/exp.conf b/conf/map/battle/exp.conf
index 8ca3de933..172959fd0 100644
--- a/conf/map/battle/exp.conf
+++ b/conf/map/battle/exp.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/map/battle/feature.conf b/conf/map/battle/feature.conf
index 1ed94b2a4..0d2ab8397 100644
--- a/conf/map/battle/feature.conf
+++ b/conf/map/battle/feature.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
@@ -83,4 +83,19 @@ features: {
 
 	// Attendance End time in the format YearMonthDay
 	feature_attendance_endtime: 20180331
+
+	// Enable Achievement System
+	// true:  enable (Default)
+	// false: disable
+	enable_achievement_system: true
+	
+	// Enable Refinery UI (requires 2016-10-05Ragexe/RE)
+	// true:  enable (Default)
+	// false: disable
+	enable_refinery_ui: false
+	
+	// Replace Refine NPCs with Refinery UI
+	// true:  enable
+	// false: disable (default)
+	replace_refine_npcs: false
 }
diff --git a/conf/map/battle/gm.conf b/conf/map/battle/gm.conf
index 872aaea6d..bd5cfbef7 100644
--- a/conf/map/battle/gm.conf
+++ b/conf/map/battle/gm.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/map/battle/guild.conf b/conf/map/battle/guild.conf
index e92760796..781f6555b 100644
--- a/conf/map/battle/guild.conf
+++ b/conf/map/battle/guild.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
@@ -45,9 +45,6 @@ guild_max_castles: 0
 // 2 - like 1, but your logged off time is also decreased from the remaining cooldown (Aegis)
 guild_skill_relog_delay: 2
 
-// 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
diff --git a/conf/map/battle/homunc.conf b/conf/map/battle/homunc.conf
index 0042df016..3884552c2 100644
--- a/conf/map/battle/homunc.conf
+++ b/conf/map/battle/homunc.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
@@ -66,3 +66,6 @@ homunculus_max_level: 99
 
 // Max level for Homunculus S
 homunculus_S_max_level: 150
+
+// Bonus EXP homunculus received from master? (Note 2)
+hom_bonus_exp_from_master: 10
diff --git a/conf/map/battle/items.conf b/conf/map/battle/items.conf
index e834b80f6..4788d7b30 100644
--- a/conf/map/battle/items.conf
+++ b/conf/map/battle/items.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/map/battle/limits.conf b/conf/map/battle/limits.conf
new file mode 100644
index 000000000..b987026ea
--- /dev/null
+++ b/conf/map/battle/limits.conf
@@ -0,0 +1,57 @@
+//================= Hercules Configuration ================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2020 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 (Limits) Configuration File
+//=========================================================================
+
+// basic attack limits
+batk_min_limit: 0
+batk_max_limit: 65535
+
+// magic attack limits
+
+matk_min_limit: 0
+matk_max_limit: 65535
+
+// weapon attack limits
+watk_min_limit: 0
+watk_max_limit: 65535
+
+// flee limits
+flee_min_limit: 1
+flee_max_limit: 32767
+
+// flee2 limits
+flee2_min_limit: 10
+flee2_max_limit: 32767
+
+// critical attack limits
+critical_min_limit: 10
+critical_max_limit: 32767
+
+// hit limits
+hit_min_limit: 1
+hit_max_limit: 32767
diff --git a/conf/map/battle/misc.conf b/conf/map/battle/misc.conf
index 5a8f916aa..8cc1d0171 100644
--- a/conf/map/battle/misc.conf
+++ b/conf/map/battle/misc.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
@@ -101,7 +101,7 @@ duel_allow_teleport: false
 // Autoleave duel when die
 duel_autoleave_when_die: true
 
-// Delay between using @duel in minutes
+// Delay between using @duel in seconds
 duel_time_interval: 60
 
 // Restrict duel usage to same map
diff --git a/conf/map/battle/monster.conf b/conf/map/battle/monster.conf
index 192e54615..fb19a6f76 100644
--- a/conf/map/battle/monster.conf
+++ b/conf/map/battle/monster.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
@@ -137,7 +137,7 @@ mob_skill_delay: 100
 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)
+// Note: This does not affects mobs with immediate respawn (most normal mobs)
 mob_spawn_delay: 100
 plant_spawn_delay: 100
 boss_spawn_delay: 100
@@ -269,3 +269,8 @@ boss_icewall_walk_block: 1
 // only have a range of 9. If you put a number higher than 0, their range will
 // be increased by that number.
 monster_eye_range_bonus: 0
+
+// Should slaves chase after what their master is chasing?
+// false: Don't chase after what master is chasing. (old behavior)
+//  true: Chase after what master is chasing. (official, default)
+slave_chase_masters_chasetarget: true
diff --git a/conf/map/battle/party.conf b/conf/map/battle/party.conf
index 621ec50f4..e27a709fd 100644
--- a/conf/map/battle/party.conf
+++ b/conf/map/battle/party.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/map/battle/pet.conf b/conf/map/battle/pet.conf
index 02324ac52..5797bb2a5 100644
--- a/conf/map/battle/pet.conf
+++ b/conf/map/battle/pet.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
@@ -32,6 +32,14 @@
 //         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary)
 //=========================================================================
 
+// Use the offical formula to calculate the pet catch rate? (Note 1)
+// Official formula:
+// CatchRate = CaptureRate * (100 - 100 * MonsterHP / MonsterMaxHP) / 100 + CaptureRate
+// Custum *Athena formula:
+// CatchRate = (CaptureRate + (CharacterBaseLevel - MonsterLevel) * 30 + CharacterLuk * 20) * (200 - 100 * MonsterHP / MonsterMaxHP) / 100
+// (CaptureRate is defined in db/(pre-)re/pet_db.conf.)
+pet_catch_rate_official_formula: true
+
 // Rate for catching pets (Note 2)
 pet_catch_rate: 100
 
@@ -44,10 +52,6 @@ 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
 
@@ -62,9 +66,6 @@ pet_damage_support: false
 // 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).
diff --git a/conf/map/battle/player.conf b/conf/map/battle/player.conf
index c7bb13e88..b691f7343 100644
--- a/conf/map/battle/player.conf
+++ b/conf/map/battle/player.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/map/battle/skill.conf b/conf/map/battle/skill.conf
index 64bba68b5..a40b52124 100644
--- a/conf/map/battle/skill.conf
+++ b/conf/map/battle/skill.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
@@ -53,8 +53,8 @@ min_skill_delay_limit: 100
 // 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
+// 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.
@@ -107,9 +107,9 @@ 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.
+// 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?
@@ -138,10 +138,22 @@ skill_nofootset: 1
 // 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
+// Hunter's traps visibility setting (with HiddenTrap: true on skill_db.conf)
+// Here we have 2 configs:
+// visibility stands to how traps are displayed by default:
+// 0: Traps are always visible to everyone (Hercules/Pre-renewal)
+// 1: Traps with HiddenTrap: true are hidden in versus maps (PvP/GvG/BG)
+// 2: Traps with HiddenTrap: true are always invisible (Renewal) (Default)
+// Notes: - Invisibility applies to players that are not in caster's party.
+//        - Invisible traps can be made visible to everyone with Hunter's Detecting skill.
+//
+// display_on_trigger tells if HiddenTraps should become visible once triggered
+// 0: Do not make traps visible once triggered (except for Ankle Snare) (Aegis)
+// 1: Always make traps visible once triggered (Hercules)
+trap_options: {
+    visibility: 2
+    display_on_trigger: 1
+}
 
 // Restrictions applied to the Alchemist's Summon Flora skill (add as necessary)
 // 1: Enable players to damage the floras outside of versus grounds.
@@ -175,7 +187,7 @@ 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:
+// 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.
@@ -330,3 +342,8 @@ bowling_bash_area: 0
 // 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
+
+// Magic Rod's animation behavior (Note 1)
+// 0 : (official) Magic Rod's animation occurs every time it is used.
+// 1 : Magic Rod's animation would not occur unless a spell was absorbed. (old behavior)
+magicrod_type: 0
diff --git a/conf/map/battle/status.conf b/conf/map/battle/status.conf
index 94459e113..8e9fe779c 100644
--- a/conf/map/battle/status.conf
+++ b/conf/map/battle/status.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/map/help.txt b/conf/map/help.txt
index 846c16276..17dd829fd 100644
--- a/conf/map/help.txt
+++ b/conf/map/help.txt
@@ -305,3 +305,5 @@ autoloottype: "Manage a list of autolooting item types.\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."
+feelreset: "Reset 'Feeling' maps."
+hatereset: "Reset 'Hatred' targets."
diff --git a/conf/map/logs.conf b/conf/map/logs.conf
index f56db9eee..a672eb2f3 100644
--- a/conf/map/logs.conf
+++ b/conf/map/logs.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
@@ -34,38 +34,40 @@
 
 map_log: {
 	// Enable Logs? (Note 3)
-	// 0x0000000 - Don't log at all
-	// 0x0000001 - (T) Log trades
-	// 0x0000002 - (V) Log vending transactions
-	// 0x0000004 - (P) Log items drop/picked by players
-	// 0x0000008 - (L) Log items drop/looted by monsters
-	// 0x0000010 - (S) Log NPC transactions (buy/sell)
-	// 0x0000020 - (N) Log Script transactions (items deleted/acquired through quests)
-	// 0x0000040 - (D) Log items stolen from mobs (Steal/Gank)
-	// 0x0000080 - (C) Log player-used items (consumables/pet&hom&merc food/items used for skills&attacks)
-	// 0x0000100 - (O) Log produced/ingredient items
-	// 0x0000200 - (U) Log MVP prize items
-	// 0x0000400 - (A) Log player created/deleted items (through @/# commands)
-	// 0x0000800 - (R) Log items placed/retrieved from storage.
-	// 0x0001000 - (G) Log items placed/retrieved from guild storage.
-	// 0x0002000 - (E) Log mail system transactions.
-	// 0x0004000 - (I) Log auction system transactions.
-	// 0x0008000 - (B) Log buying store transactions
-	// 0x0010000 - (X) Log other transactions
-	// 0x0020000 - (K) Log account bank transactions
-	// 0x0040000 - (Y) Divorce
-	// 0x0080000 - (Z) Roulette
-	// 0x0100000 - (W) Rental
-	// 0x0200000 - (Q) Card
-	// 0x0400000 - (J) Invalid in inventory
-	// 0x0800000 - (H) Invalid in cart
-	// 0x1000000 - (@) Egg
-	// 0x2000000 - (0) Quest
-	// 0x4000000 - (1) Skill
-	// 0x8000000 - (2) Refine
+	// 0x00000000 - Don't log at all
+	// 0x00000001 - (T) Log trades X
+	// 0x00000002 - (V) Log vending transactions X
+	// 0x00000004 - (P) Log items drop/picked by players X
+	// 0x00000008 - (M) Log items dropped by monsters
+	// 0x00000010 - (S) Log NPC transactions (buy/sell)
+	// 0x00000020 - (N) Log Script transactions (items deleted/acquired through quests)
+	// 0x00000040 - (D) Log items stolen from mobs (Steal/Gank)
+	// 0x00000080 - (C) Log player-used items (consumables/pet&hom&merc food/items used for skills&attacks)	
+	// 0x00000100 - (O) Log produced/ingredient items
+	// 0x00000200 - (U) Log MVP prize items
+	// 0x00000400 - (A) Log player created/deleted items (through @/# commands)
+	// 0x00000800 - (R) Log items placed/retrieved from storage.
+	// 0x00001000 - (G) Log items placed/retrieved from guild storage.
+	// 0x00002000 - (E) Log mail system transactions.
+	// 0x00004000 - (I) Log auction system transactions.
+	// 0x00008000 - (B) Log buying store transactions
+	// 0x00010000 - (X) Log other transactions
+	// 0x00020000 - (K) Log account bank transactions
+	// 0x00040000 - (Y) Divorce
+	// 0x00080000 - (Z) Roulette
+	// 0x00100000 - (W) Rental
+	// 0x00200000 - (Q) Card
+	// 0x00400000 - (J) Invalid in inventory
+	// 0x00800000 - (H) Invalid in cart
+	// 0x01000000 - (@) Egg
+	// 0x02000000 - (0) Quest
+	// 0x04000000 - (1) Skill
+	// 0x08000000 - (2) Refine
+	// 0x10000000 - (L) Log items looted by monsters
+	// 0x20000000 - (3) Achievements
 	// 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: 0xFFFFFFF
+	enable: 0xFFFFFFFF
 
 	// Logging files/tables
 	// Following settings specify where to log to. If 'use_sql' is
diff --git a/conf/map/map-server.conf b/conf/map/map-server.conf
index 943b7b5a6..c720c28e2 100644
--- a/conf/map/map-server.conf
+++ b/conf/map/map-server.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
@@ -106,6 +106,7 @@ map_configuration: {
 		// 0x040: After successfully get/delete/complete a quest
 		// 0x080: After every buying store transaction
 		// 0x100: After every bank transaction (deposit/withdraw)
+		// 0x200: After every allow party flag change
 		// 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
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 1634ef3a8..64299c731 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
diff --git a/conf/map/script.conf b/conf/map/script.conf
index f18e9d6e2..fc4f26965 100644
--- a/conf/map/script.conf
+++ b/conf/map/script.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2018  Hercules Dev Team
+//= Copyright (C) 2014-2020 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
@@ -52,7 +52,7 @@ script_configuration: {
 	// 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
+	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.
diff --git a/conf/messages.conf b/conf/messages.conf
index 2f790b13f..98b0e0a9d 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -191,7 +191,7 @@
 170: The item is not equippable.
 171: %d - void
 172: Speed returned to normal.
-//173 FREE
+173: Please enter a valid madogear type.
 174: Number of status points changed.
 175: Number of skill points changed.
 176: Current amount of zeny changed.
@@ -368,7 +368,7 @@
 353: Duel: The Player is in the duel already.
 354: Duel: Invitation has been sent.
 355: Duel: You can't use @duel without @reject.
-356: Duel: You can take part in duel once per %d minutes.
+356: Duel: You can take part in duel again after %d seconds.
 357: Duel: Invalid value.
 358: Duel: You can't use @leave. You aren't a duelist.
 359: Duel: You've left the duel.
@@ -442,14 +442,36 @@
 432: change the sex of
 433: This character has been banned until 
 434: Char-server has been asked to %s the character '%.*s'.
-//435-449 FREE
+//435-448 FREE
 // Homunculus messages
+449: Homunculus Experience Gained Base:%u (%.2f%%)
 450: You already have a homunculus
 
 // Return pet to egg message
 451: You can't return your pet because your inventory is full.
 452: usage @camerainfo range rotation latitude
-//453-497 FREE
+
+// Refinary
+453: Refinery UI is not available
+
+// Battlegrounds
+454: Server : %s is leaving the battlefield...
+455: Server : %s has been afk-kicked from the battlefield...
+456: You are a deserter! Wait %u minute(s) before you can apply again
+457: You are a deserter! Wait %u seconds before you can apply again
+458: You can't reapply to this arena so fast. Apply to the different arena or wait %u minute(s)
+459: You can't reapply to this arena so fast. Apply to the different arena or wait %u seconds
+460: Can't apply: not enough members in your team/guild that have not entered the queue in individual mode, minimum is %d
+461: Can't apply: not enough members in your team/guild, minimum is %d
+462: Can't apply: not enough members in your team/party that have not entered the queue in individual mode, minimum is %d
+463: Can't apply: not enough members in your team/party, minimum is %d
+464: Server : %s has quit the game...
+// IRC
+465: [ #%s ] User IRC.%s left the channel. [Quit: %s]
+466: [ #%s ] User IRC.%s left the channel. [%s]
+467: [ #%s ] User IRC.%s is now known as IRC.%s
+468: [ #%s ] User IRC.%s joined the channel.
+// 469-497 FREE
 
 // Messages of others (not for GM commands)
 // ----------------------------------------
@@ -477,7 +499,8 @@
 // mail system
 //----------------------
 510: You have %d new emails (%d unread)
-//511-537 FREE
+511: Inbox is full (Max %d). Delete some mails.
+// 512-537 FREE
 
 // Trade Spoof Messages
 538: Hack on trade: character '%s' (account: %d) try to trade more items that he has.
@@ -660,7 +683,28 @@
 879: You have become the Guild Master!
 880: You have been recovered!
 881: Shop is out of stock! Come again later!
-//882-899 FREE
+
+// Frost Joker / Scream text for monster (MobName : SkillName !!)
+882: %s : %s !!
+// Cursed Circle
+883: You are too close to a stone or emperium to do this skill
+//
+884: Skill Failed. [%s] requires %dx %s.
+885: Removed %dz.
+886: Gained %dz.
+887: %s stole an Unknown Item (id: %i).
+888: %s stole %s.
+889: Experience Gained Base:%"PRIu64" (%.2f%%) Job:%"PRIu64" (%.2f%%)
+890: [KS Warning!! - Owner : %s]
+891: [Watch out! %s is trying to KS you!]
+892: Growth: hp:%d sp:%d str(%.2f) agi(%.2f) vit(%.2f) int(%.2f) dex(%.2f) luk(%.2f)
+893: [ Kill Steal Protection Disabled. KS is allowed in this map ]
+894: %s is in autotrade mode and cannot receive whispered messages.
+// 895 FREE
+896: Base EXP : %d%% | Base Drop: %d%% | Base Death Penalty: %d%%
+897: #%s '%s' joined
+898: #%s '%s' left
+// 899 FREE
 
 //------------------------------------
 // More atcommands message
@@ -719,7 +763,10 @@
 926: Zone not found. Keep in mind that the names are CaSe SenSitiVe.
 927: Zone successfully changed from '%s' to '%s'.
 
-//928-979 FREE
+//928-978 FREE
+
+// @hatereset
+979: Reset 'Hatred' targets.
 
 // @kami
 980: Please enter a message (usage: @kami <message>).
@@ -758,18 +805,18 @@
 
 //995 FREE
 
-// @refine
+// @refine - Part 1
 996: Please enter a position bitmask and an amount (usage: @refine <equip position> <+/- amount>).
-997: %d: Lower Headgear
-998: %d: Right Hand
+997: %d: Headgear (Low)
+998: %d: Hand (Right)
 999: %d: Garment
-1000: %d: Left Accessory
+1000: %d: Accessory (Left)
 1001: %d: Body Armor
-1002: %d: Left Hand
+1002: %d: Hand (Left)
 1003: %d: Shoes
-1004: %d: Right Accessory
-1005: %d: Top Headgear
-1006: %d: Mid Headgear
+1004: %d: Accessory (Right)
+1005: %d: Headgear (Top)
+1006: %d: Headgear (Mid)
 
 // @produce
 1007: Please enter at least one item name/ID (usage: @produce <equip name/ID> <element> <# of very's>).
@@ -969,8 +1016,8 @@
 // @loadnpc
 1132: Please enter a script file name (usage: @loadnpc <file name>).
 
-// @npcoff
-1133: Please enter a NPC name (usage: @npcoff <NPC_name>).
+// @unloadnpc
+1133: Please enter a NPC name (Usage: @unloadnpc <NPC_name> {<flag>}).
 
 // @jail
 1134: Please enter a player name (usage: @jail <char_name>).
@@ -1408,8 +1455,8 @@
 1384: User '%s' permissions updated successfully. The changes are temporary.
 
 // @unloadnpcfile
-1385: Usage: @unloadnpcfile <file name>
-1386: File unloaded. Be aware that mapflags and monsters spawned directly are not removed.
+1385: Usage: @unloadnpcfile <path> {<flag>}
+1386: File unloaded. Be aware that some changes made by NPC are not reverted on unload. See doc/atcommands.txt for details.
 1387: File not found.
 
 // General command messages
@@ -1569,5 +1616,33 @@
 1498: You can't add a party bound item to a character without party!
 1499: You can't add a guild bound item to a character without guild!
 
+// @dropall
+1500: Usage: @dropall {<type>}
+1501: Type List: (default) all = -1, healing = 0, usable = 2, etc = 3, weapon = 4, armor = 5, card = 6, petegg = 7, petarmor = 8, ammo = 10, delayed-consumable = 11, cash = 18 
+1502: %d items are dropped (%d skipped)!
+
+// @refine - Part 2
+1503: %d: Costume Headgear (Top)
+1504: %d: Costume Headgear (Mid)
+1505: %d: Costume Headgear (Low)
+1506: %d: Costume Garment
+1507: %d: Shadow Armor
+1508: %d: Shadow Weapon
+1509: %d: Shadow Shield
+1510: %d: Shadow Shoes
+1511: %d: Shadow Accessory (Right)
+1512: %d: Shadow Accessory (Left)
+1513: %d: Refine All Equip (General)
+1514: %d: Refine All Equip (Costume)
+1515: %d: Refine All Equip (Shadow)
+
+// @reloadnpc
+1516: Usage: @reloadnpc <path> {<flag>}
+1517: Script could not be unloaded.
+
+// File name validation
+1518: Not a file.
+1519: Can't open file.
+
 //Custom translations
 import: conf/import/msg_conf.txt