update for hercules v2020.06.28

15 files changed, 366 insertions, 158 deletions

diff --git a/conf/common/inter-server.conf b/conf/common/inter-server.conf
index df326a67..6db189a7 100644
--- a/conf/common/inter-server.conf
+++ b/conf/common/inter-server.conf
@@ -76,14 +76,16 @@ inter_configuration: {
 			acc_reg_str_db: "acc_reg_str_db"
 			char_reg_str_db: "char_reg_str_db"
 			char_reg_num_db: "char_reg_num_db"
-
 			global_acc_reg_num_db: "global_acc_reg_num_db"
 			global_acc_reg_str_db: "global_acc_reg_str_db"
+			map_reg_num_db: "map_reg_num_db"
+			map_reg_str_db: "map_reg_str_db"
 		}
 		pc: {
 			hotkey_db: "hotkey"
 			scdata_db: "sc_data"
 			cart_db: "cart_inventory"
+            achievement_db: "char_achievements"
 			inventory_db: "inventory"
 			charlog_db: "charlog"
 			storage_db: "storage"
@@ -112,11 +114,11 @@ inter_configuration: {
 			position_db: "guild_position"
 			storage_db: "guild_storage"
 		}
-		mapreg_db: "mapreg"
 		autotrade_merchants_db: "autotrade_merchants"
 		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"
 	}
 
     // Show warning in console if some string translation missing for selected language
diff --git a/conf/common/map-index.conf b/conf/common/map-index.conf
new file mode 100644
index 00000000..b3a1b4e8
--- /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-2019  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/map/battle/client.conf b/conf/map/battle/client.conf
index 9a4305f4..2f281201 100644
--- a/conf/map/battle/client.conf
+++ b/conf/map/battle/client.conf
@@ -202,3 +202,39 @@ ping_time: 20
 // Drop or not connection after client send disconnect request packet
 // Official is false
 drop_connection_on_quit: true
+
+// When to display the rate modifier messages?
+// 0x0 - Never display rate modifier messages.
+// 0x1 - Display rate modifier messages upon login.
+// 0x2 - Display rate modifier messages upon map change.
+// 0x4 - Display rate modifier messages upon teleporting (regardless of changing maps).
+// Default: 0x1 (Official behavior.)
+display_rate_messages: 0x1
+
+// When to display the configuration messages and which? (Note 3)
+//
+// Flags for when to display the configuration messages:
+// 0x000 - Never display configuration messages.
+// 0x001 - Display configuration messages upon login. (Default. Should always be set.)
+// 0x002 - Display configuration messages upon map change.
+// 0x004 - Display configuration messages upon teleporting (regardless of changing maps).
+//
+// Flags for which configuration messages are displayed:
+// 0x010 - Character's party invitation state. (Default.)
+// 0x020 - Character's view equipment state. (Default.)
+// 0x040 - Character's Urgent Call state. (Default.)
+// 0x080 - Character's pet auto-feed state. (Default.)
+// 0x100 - Character's homunculus auto-feed state. (Default.)
+//
+// Default: 0x1F1 (Official behavior.)
+display_config_messages: 0x1F1
+
+// When to display the overweight messages?
+// 0x0 - Never display overweight messages.
+// 0x1 - Display overweight messages upon login. (Default.)
+// 0x2 - Display overweight messages upon map change. (Default.)
+// Default: 0x3 (Official behavior.)
+display_overweight_messages: 0x3
+
+// Show tip of the day window upon login?
+show_tip_window: true
diff --git a/conf/map/battle/guild.conf b/conf/map/battle/guild.conf
index 101349a8..204c295c 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-2019  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
@@ -62,11 +59,13 @@ require_glory_guild: false
 // 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
+// When to display the guild notice?
+// 0x0 - Never display guild notice.
+// 0x1 - Display guild notice upon login.
+// 0x2 - Display guild notice upon map change.
+// 0x4 - Display guild notice upon teleporting (regardless of changing maps).
+// Default: 0x7 (Official behavior.)
+guild_notice_changemap: 0x7
 
 // Can guild members invite/expel members inside guild castles in WoE/GvG? (Note 1)
 // default: false
diff --git a/conf/map/battle/items.conf b/conf/map/battle/items.conf
index 0dd990e0..ef383e19 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-2019  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
@@ -100,10 +100,14 @@ autospell_stacking: false
 // 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
+// Which item actions are allowed while interacting with NPC? (Note 3)
+// Script commands 'enable_items/disable_items' will not be overridden. (See doc/script_commands.txt.)
+// 0x0 (ITEMENABLEDNPC_NONE)    - Don't allow any item actions.
+// 0x1 (ITEMENABLEDNPC_EQUIP)   - Allow changing equipment.
+// 0x2 (ITEMENABLEDNPC_CONSUME) - Allow consuming usable items.
+// Official RE: 0x1 (Default value.)
+// Official Pre-RE: 0x3
+item_enabled_npc: 0x1
 
 // Unequip the equipments that has disabled by map_zone_db.conf ?
 // 0 : disabled equipments and cards are nullify (official)
diff --git a/conf/map/battle/misc.conf b/conf/map/battle/misc.conf
index aa5cf850..4aa273f8 100644
--- a/conf/map/battle/misc.conf
+++ b/conf/map/battle/misc.conf
@@ -101,8 +101,8 @@ duel_allow_teleport: false
 // Autoleave duel when die
 duel_autoleave_when_die: true
 
-// Delay between using @duel in minutes
-duel_time_interval: 1
+// Delay between using @duel in seconds
+duel_time_interval: 60
 
 // Restrict duel usage to same map
 duel_only_on_same_map: false
diff --git a/conf/map/battle/monster.conf b/conf/map/battle/monster.conf
index d75b7d16..ac4ebba9 100644
--- a/conf/map/battle/monster.conf
+++ b/conf/map/battle/monster.conf
@@ -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 085e3091..a34a0c4f 100644
--- a/conf/map/battle/party.conf
+++ b/conf/map/battle/party.conf
@@ -80,3 +80,30 @@ 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: true
+
+// When and how to send the party options? (Note 3)
+//
+// Flags for when to display the party options:
+// 0x00000 - Never send party options.
+// 0x00001 - Send party options upon login. (Default. Should always be set.)
+// 0x00002 - Send party options upon map change.
+// 0x00004 - Send party options upon teleporting (regardless of changing maps).
+// 0x00008 - Send party options upon successfully changing options manually. (Default. Should always be set.)
+// 0x00010 - Send party options upon unsuccessfully changing options manually. (Tried to enable EXP sharing if not allowed.) (Default.)
+// 0x00020 - Send party options upon changing options automatically. (Default. Should always be set.)
+// 0x00040 - Send party options upon joining party. (Default. Should always be set.)
+// 0x00080 - Send party options upon leaving party. (Default.)
+//
+// Flags for how to send the party options:
+// 0x00100 - Send party options to all party members upon unsuccessfully changing options manually. (Tried to enable EXP sharing if not allowed.) (Default.)
+// 0x00200 - Send all party options upon login.
+// 0x00400 - Send all party options upon map change.
+// 0x00800 - Send all party options upon teleporting (regardless of changing maps).
+// 0x01000 - Send all party options upon successfully changing options manually. (Default.)
+// 0x02000 - Send all party options upon unsuccessfully changing options manually. (Tried to enable EXP sharing if not allowed.) (Default.)
+// 0x04000 - Send all party options upon changing options automatically.
+// 0x08000 - Send all party options upon joining party.
+// 0x10000 - Send all party options upon leaving party.
+//
+// Default: 0x31F9 (Official behavior.)
+send_party_options: 0x31F9
diff --git a/conf/map/battle/pet.conf b/conf/map/battle/pet.conf
index cbe854d4..9ee4c9f8 100644
--- a/conf/map/battle/pet.conf
+++ b/conf/map/battle/pet.conf
@@ -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
 
@@ -98,3 +106,7 @@ pet_max_atk2: 1000
 // 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
+
+// Should the pet immediately be removed when its intimacy drops to 0? (Note 1)
+// If set to false the pet will randomly walk around the map before being removed.
+pet_remove_immediately: true
diff --git a/conf/map/battle/player.conf b/conf/map/battle/player.conf
index ed5767ae..aa9cf92f 100644
--- a/conf/map/battle/player.conf
+++ b/conf/map/battle/player.conf
@@ -226,3 +226,10 @@ shadow_refine_atk: true
 // Keep player facing direction after warping?
 // Default: false (on official servers players always faces north)
 player_warp_keep_direction: true
+
+// Can dead players do actions like trading, open a chat room, etc.?
+// 0x0 - Don't allow trading and open chat rooms.
+// 0x1 - Allow trading when dead.
+// 0x2 - Allow open chat room when dead.
+// default: 0x3 (Official)
+allowed_actions_when_dead: 0x3
diff --git a/conf/map/battle/skill.conf b/conf/map/battle/skill.conf
index e0188c8f..5a58a8a1 100644
--- a/conf/map/battle/skill.conf
+++ b/conf/map/battle/skill.conf
@@ -97,7 +97,7 @@ skillrange_by_distance: 14
 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 
+// 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
 
@@ -347,3 +347,16 @@ stormgust_knockback: true
 // 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
+
+// Which skills are allowed to use while interacting with NPC?
+// 0 (SKILLENABLEDNPC_NONE) - Don't allow using skills.
+// 1 (SKILLENABLEDNPC_SELF) - Allow using non-damaging self skills.
+// 2 (SKILLENABLEDNPC_ALL)  - Allow using all skills.
+// Official RE: 0 (Default value.)
+// Official Pre-RE: 1
+skill_enabled_npc: 0
+
+// Close the storage/gstorage when teleported? (Note 1)
+// true : (Official)
+// false : (Athena)
+teleport_close_storage: true
diff --git a/conf/map/help.txt b/conf/map/help.txt
index 846c1627..17dd829f 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 9526372e..654209b7 100644
--- a/conf/map/logs.conf
+++ b/conf/map/logs.conf
@@ -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/script.conf b/conf/map/script.conf
index 802ce253..98a39f52 100644
--- a/conf/map/script.conf
+++ b/conf/map/script.conf
@@ -59,6 +59,16 @@ script_configuration: {
 	// Defaults to INT_MAX.
 	//input_max_value: 2147483647
 	input_max_value: 10000000
+
+	// Specifies whether functions not explicitly marked with a "private" or
+	// "public" keyword should be treated as "private" by default.
+	// Default: true
+	functions_private_by_default: true
+
+	// Specifies whether public functions can be invoked as NPC events. This
+	// allows, for example, to use a `public function OnDeath { ... }` instead
+	// of a `OnDeath:` label for mob death events.
+	functions_as_events: true
 }
 
 import: "conf/import/script.conf"
diff --git a/conf/messages.conf b/conf/messages.conf
index d62999b5..d6250406 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -4,7 +4,7 @@
 //= This file handles all messages set throughout the server.
 //============================================================
 // For translation, just change msg here (second line),
-// no need to modify source code or alternatively, 
+// no need to modify source code or alternatively,
 // use conf/import/msg_conf.txt.
 //============================================================
 // Format:
@@ -56,10 +56,10 @@
 28: No player found.
 29: 1 player found.
 30: %d players found.
-31: PvP Off.
-32: PvP On.
-33: GvG Off.
-34: GvG On.
+31: PvP: Off.
+32: PvP: On.
+33: GvG: Off.
+34: GvG: On.
 35: This job has no alternate body styles.
 36: Appearance changed.
 37: An invalid number was specified.
@@ -102,7 +102,8 @@
 79: %d results found.
 80: Please specify a display name or monster name/id.
 81: Your GM level doesn't authorize you to perform this action on the specified player.
-//82-83 FREE
+82: Roulette is disabled
+//83 FREE
 84: All stats changed!
 85: Invalid time for ban command.
 //86-87 FREE
@@ -190,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.
@@ -215,7 +216,7 @@
 201: You don't have this quest skill.
 //202-203 FREE
 204: You can't open a shop on this cell.
-205: Maybe you meant: 
+205: Maybe you meant:
 206: '%s' skill points reset.
 207: '%s' stats points reset.
 208: '%s' skill and stat points have been reset.
@@ -350,9 +351,9 @@
 //335-342 FREE
 
 // Templates for @who output
-343: Name: %s 
-344: (%s) 
-345: | Party: '%s' 
+343: Name: %s
+344: (%s)
+345: | Party: '%s'
 346: | Guild: '%s'
 //You may omit the last %s, then you won't see players job name
 347: | Lv:%d/%d | Job: %s
@@ -361,22 +362,22 @@
 //349 FREE
 
 // @duel
-350: Duel| You can't use @invite. You aren't a duelist.
-351: Duel| The limit of players has been reached.
-352: Duel| Player name not found.
-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.
-357: Duel| Invalid value.
-358: Duel| You can't use @leave. You aren't a duelist.
-359: Duel| You've left the duel.
-360: Duel| You can't use @accept without a duel invitation.
-361: Duel| The duel invitation has been accepted.
-362: Duel| You can't use @reject without a duel invitation.
-363: Duel| The duel invitation has been rejected.
-364: Duel| You can't invite %s because he/she isn't in the same map.
-365: Duel| Can't use %s in duel.
+350: Duel: You can't use @invite. You aren't a duelist.
+351: Duel: The limit of players has been reached.
+352: Duel: Player name not found.
+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 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.
+360: Duel: You can't use @accept without a duel invitation.
+361: Duel: The duel invitation has been accepted.
+362: Duel: You can't use @reject without a duel invitation.
+363: Duel: The duel invitation has been rejected.
+364: Duel: You can't invite %s because he/she isn't in the same map.
+365: Duel: Can't use %s in duel.
 // Stylist Shop
 366: Styling Shop
 367: <MSG>2949</MSG>
@@ -429,7 +430,7 @@
 420: Your account is no longer authorized.
 421: Your account has been totally erased.
 //422 FREE
-423: Your account has been banished until 
+423: Your account has been banished until
 424: Login-server has been asked to %s the player '%.*s'.
 425: The player '%.*s' doesn't exist.
 426: Your GM level doesn't authorize you to %s the player '%.*s'.
@@ -439,17 +440,38 @@
 430: unblock
 431: unban
 432: change the sex of
-433: This character has been banned until 
+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
+
+// Refinary
 453: Refinery UI is not available
-//454-497 FREE
+
+// 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.
@@ -641,7 +664,7 @@
 
 // Etc messages from source
 862: You're too close to a NPC, you must be at least %d cells away from any NPC.
-863: Duel| Can't use this item in duel.
+863: Duel: Can't use this item in duel.
 864: You cannot use this command when dead.
 865: Can't create chat rooms in this area.
 866: Pets are not allowed in Guild Wars.
@@ -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
@@ -687,7 +731,7 @@
 911: Please enter a player name (usage: @jumpto/@warpto/@goto <char name/ID>).
 
 // @who
-912: (CID:%d/AID:%d) 
+912: (CID:%d/AID:%d)
 
 // @whogm
 913: Name: %s (GM)
@@ -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>).
@@ -865,58 +912,58 @@
 1043: Autotrade Enabled
 1044: Autotrade Disabled
 1045: Battlegrounds ON
-1046: PvP Flags: 
-1047: Pvp ON | 
-1048: NoGuild | 
-1049: NoParty | 
-1050: NightmareDrop | 
-1051: NoCalcRank | 
-1052: GvG Flags: 
-1053: GvG ON | 
-1054: GvG Dungeon | 
-1055: GvG Castle | 
-1056: NoParty | 
-1057: Teleport Flags: 
-1058: NoTeleport | 
-1059: Monster NoTeleport | 
-1060: NoWarp | 
-1061: NoWarpTo | 
-1062: NoReturn | 
-1063: NoAutoloot | 
-1064: NoMemo | 
+1046: PvP Flags:
+1047: Pvp ON |
+1048: NoGuild |
+1049: NoParty |
+1050: NightmareDrop |
+1051: NoCalcRank |
+1052: GvG Flags:
+1053: GvG ON |
+1054: GvG Dungeon |
+1055: GvG Castle |
+1056: NoParty |
+1057: Teleport Flags:
+1058: NoTeleport |
+1059: Monster NoTeleport |
+1060: NoWarp |
+1061: NoWarpTo |
+1062: NoReturn |
+1063: NoAutoloot |
+1064: NoMemo |
 1065: No Exp Penalty: %s | No Zeny Penalty: %s
 1066: On
 1067: Off
 1068: No Save (Return to last Save Point)
 1069: No Save, Save Point: %s,Random
 1070: No Save, Save Point: %s,%d,%d
-1071: Weather Flags: 
-1072: Snow | 
-1073: Fog | 
-1074: Sakura | 
-1075: Clouds | 
-1076: Clouds2 | 
-1077: Fireworks | 
-1078: Leaves | 
-1079: NoViewID | 
-1080: Displays Night | 
-1081: Other Flags: 
-1082: NoBranch | 
-1083: NoTrade | 
-1084: NoVending | 
-1085: NoDrop | 
-1086: NoSkill | 
-1087: NoIcewall | 
-1088: AllowKS | 
-1089: Reset | 
-1090: Other Flags: 
-1091: NoCommand | 
-1092: NoBaseEXP | 
-1093: NoJobEXP | 
-1094: NoMobLoot | 
-1095: NoMVPLoot | 
-1096: PartyLock | 
-1097: GuildLock | 
+1071: Weather Flags:
+1072: Snow |
+1073: Fog |
+1074: Sakura |
+1075: Clouds |
+1076: Clouds2 |
+1077: Fireworks |
+1078: Leaves |
+1079: NoViewID |
+1080: Displays Night |
+1081: Other Flags:
+1082: NoBranch |
+1083: NoTrade |
+1084: NoVending |
+1085: NoDrop |
+1086: NoSkill |
+1087: NoIcewall |
+1088: AllowKS |
+1089: Reset |
+1090: Other Flags:
+1091: NoCommand |
+1092: NoBaseEXP |
+1093: NoJobEXP |
+1094: NoMobLoot |
+1095: NoMVPLoot |
+1096: PartyLock |
+1097: GuildLock |
 1098: ----- Players in Map -----
 1099: Player '%s' (session #%d) | Location: %d,%d
 1100: ----- NPCs in Map -----
@@ -931,7 +978,7 @@
 1109: North
 1110: Unknown
 1111: NPC %d: %s | Direction: %s | Sprite: %d | Location: %d %d
-1112: NPC %d: %s::%s | Direction: %s | Sprite: %d | Location: %d %d 
+1112: NPC %d: %s::%s | Direction: %s | Sprite: %d | Location: %d %d
 1113: ----- Chats in Map -----
 1114: Chat: %s | Player: %s | Location: %d %d
 1115:    Users: %d/%d | Password: %s | Public: %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>).
@@ -1244,7 +1291,7 @@
 1277: Item: '%s'/'%s'[%d] (%d) Type: %s | Extra Effect: %s
 1278: None
 1279: With script
-1280: NPC Buy:%dz, Sell:%dz | Weight: %.1f 
+1280: NPC Buy:%dz, Sell:%dz | Weight: %.1f
 1281:  - Available in shops only.
 1282:  - Maximal monsters drop chance: %02.02f%%
 1283:  - Monsters don't drop this item.
@@ -1263,8 +1310,8 @@
 // @mobinfo ...
 1291:  ATK:%d~%d MATK:%d~%d Range:%d~%d~%d  Size:%s  Race: %s  Element: %s (Lv:%d)
 
-1292: PrivateAirshipStartable | 
-1293: PrivateAirshipEndable | 
+1292: PrivateAirshipStartable |
+1293: PrivateAirshipEndable |
 //1294 used by hercules chat feature
 
 // @version
@@ -1340,26 +1387,26 @@
 
 // @itemlist
 1332: ------ %s items list of '%s' ------
-1333:  | equipped: 
-1334: garment, 
-1335: left accessory, 
-1336: body/armor, 
-1337: right hand, 
-1338: left hand, 
-1339: both hands, 
-1340: feet, 
-1341: right accessory, 
-1342: lower head, 
-1343: top head, 
-1344: lower/top head, 
-1345: mid head, 
-1346: lower/mid head, 
-1347: lower/mid/top head, 
+1333:  | equipped:
+1334: garment,
+1335: left accessory,
+1336: body/armor,
+1337: right hand,
+1338: left hand,
+1339: both hands,
+1340: feet,
+1341: right accessory,
+1342: lower head,
+1343: top head,
+1344: lower/top head,
+1345: mid head,
+1346: lower/mid head,
+1347: lower/mid/top head,
 1348:  -> (pet egg, pet id: %u, named)
 1349:  -> (pet egg, pet id: %u, unnamed)
 1350:  -> (crafted item, creator id: %u, star crumbs %d, element %d)
 1351:  -> (produced item, creator id: %u)
-1352:  -> (card(s): 
+1352:  -> (card(s):
 1353: No item found in this player's %s.
 1354: %d item(s) found in %d %s slots.
 
@@ -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
@@ -1458,7 +1505,7 @@
 1410: -- Public Channels
 1411: Unknown color '%s'
 1412: You're not the owner of channel '%s'
-1413: '%s' channel color updated to '%s' 
+1413: '%s' channel color updated to '%s'
 1414: --- Available options:
 1415: -- %s create <channel name> <channel password>
 1416: - creates a new channel
@@ -1571,8 +1618,8 @@
 
 // @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!
+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)
@@ -1589,5 +1636,13 @@
 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