Merge pull request #1 from HerculesWS/master

Update from original

26 files changed, 508 insertions, 319 deletions

diff --git a/conf/atcommand.conf b/conf/atcommand.conf
index 6e35d5327..df4972067 100644
--- a/conf/atcommand.conf
+++ b/conf/atcommand.conf
@@ -14,8 +14,7 @@ atcommand_symbol : "@"
 charcommand_symbol: "#"
 
 /* Command aliases
-You can define aliases for any command. Aliases work just like original
-command.
+You can define aliases for any command. Aliases work just like the original command.
 Format is
 	<commandname>: ["<alias>", ...]
 */
@@ -57,10 +56,11 @@ aliases: {
 	accinfo: ["accountinfo"]
 	itemreset: ["clearinventory"]
 	channel: ["main"]
+	autoloottype: ["aloottype"]
 }
 
-/* list of commands that should not be logged at all */
-/* add as many commands as you like */
+/* List of commands that should not be logged at all */
+/* Add as many commands as you like */
 nolog: {
 	iteminfo: 1
 	mobinfo: 1
@@ -69,4 +69,4 @@ nolog: {
 /* Commands help file */
 help: {
 	@include "conf/help.txt"
-}
\ No newline at end of file
+}
diff --git a/conf/battle/battle.conf b/conf/battle/battle.conf
index 94f80a2a6..fc962b008 100644
--- a/conf/battle/battle.conf
+++ b/conf/battle/battle.conf
@@ -54,6 +54,7 @@ player_damage_delay_rate: 100
 undead_detect_type: 0
 
 // Does HP recover if hit by an attribute that's same as your own? (Note 1)
+// (Will not work in Renewal)
 attribute_recover: no
 
 // What is the minimum and maximum hitrate of normal attacks? 
@@ -94,11 +95,11 @@ vit_penalty_num: 5
 
 // Use alternate method of DEF calculation for physical attacks.
 // With 0, disabled (use normal def% reduction with further def2 reduction)
-// At 1 or more defense is substraction of (DEF* value).
+// At 1 or more defense is subtraction of (DEF* value).
 // eg: 10 + 50 def becomes 0 + (10*type + 50)
 weapon_defense_type: 0
 
-//MDEF‚same as above....(MDEF*value)
+// MDEF, same as above....(MDEF*value)
 magic_defense_type: 0
 
 // Change attacker's direction to face opponent on every attack? (Note 3)
@@ -141,3 +142,7 @@ arrow_decrement: 1
 // range. For example, Sonic Blow requires a 2 cell distance before autocasting is allowed.
 // This setting also affects autospellwhenhit.
 autospell_check_range: no
+
+// If both the attacker and the target are on the same tile, should the target be knocked back to the left?
+// Official behavior is "yes", setting this to "no" will knock the target back behind the attacker.
+knockback_left: yes
diff --git a/conf/battle/client.conf b/conf/battle/client.conf
index 93ad536ee..5089fa4a5 100644
--- a/conf/battle/client.conf
+++ b/conf/battle/client.conf
@@ -21,7 +21,7 @@ min_chat_delay: 0
 
 // Valid range of dyes and styles on the client.
 min_hair_style: 0
-max_hair_style: 27
+max_hair_style: 29
 min_hair_color: 0
 max_hair_color: 8
 min_cloth_color: 0 
@@ -30,7 +30,7 @@ max_cloth_color: 4
 // When set to yes, the damage field in packets sent from woe maps will be set
 // to -1, making it impossible for GMs, Bots and Hexed clients to know the
 // actual damage caused by attacks. (Note 1)
-hide_woe_damage: no
+hide_woe_damage: yes
 
 // "hair style" number that identifies pet.
 // NOTE: The client uses the "hair style" field in the mob packet to tell them apart from mobs.
@@ -112,3 +112,17 @@ client_reshuffle_dice: yes
 // Official servers do not sort storage. (Note 1)
 // NOTE: Enabling this option degrades performance.
 client_sort_storage: no
+
+// Duration of client's self mute in minutes.
+// Note: Do not enable this, if you enabled commands for players,
+// because the client sees multiple commands in succession as spam.
+// Default: 0 (means disabled)
+client_accept_chatdori: 0
+
+// Limits use of blank (transparent) pixels in guild emblems to a set
+// percentage of the total.
+// Official servers do not enforce this technically to date, but some disallow
+// use of blank emblems in their rules. (Note 2)
+// A value of 100 (allowing 100% blank pixels) disables this check.
+// NOTE: Enabling this option slightly degrades performance.
+client_emblem_max_blank_percent: 100
diff --git a/conf/battle/drops.conf b/conf/battle/drops.conf
index 3704b9a0e..424c46f5b 100644
--- a/conf/battle/drops.conf
+++ b/conf/battle/drops.conf
@@ -7,10 +7,10 @@
 // Note 2: Value is in percents (100 means 100%)
 //--------------------------------------------------------------
 
-// If an item is dropped, does it go stright into the users inventory? (Note 1)
+// If an item is dropped, does it go straight into the users inventory? (Note 1)
 item_auto_get: no
 
-// How long does it take for an item to disappear from the floor after it is dropped? (in miliseconds)
+// How long does it take for an item to disappear from the floor after it is dropped? (in milliseconds)
 flooritem_lifetime: 60000
 
 // Grace time during which only the person who did the most damage to a monster can get the item? (in milliseconds)
@@ -117,9 +117,6 @@ drops_by_luk: 0
 // (So at 100 luk, everything will have double chance of dropping).
 drops_by_luk2: 0
 
-// The rate of monsters dropping ores by the skill Ore Discovery (Default is 100)
-finding_ore_rate: 100
-
 // Whether or not Marine Spheres and Floras summoned by Alchemist drop items?
 // This setting has three available values:
 // 0: Nothing drops.
diff --git a/conf/battle/feature.conf b/conf/battle/feature.conf
index 7e1f83707..161ea324d 100644
--- a/conf/battle/feature.conf
+++ b/conf/battle/feature.conf
@@ -17,4 +17,13 @@ feature.search_stores: on
 
 // Atcommand suggestions (Note 1)
 // If one type incomplete atcommand, it will suggest the complete ones.
-feature.atcommand_suggestions: off
\ No newline at end of file
+feature.atcommand_suggestions: off
+
+// Banking (Note 1)
+// Requires: 2013-07-24aRagexe or later
+feature.banking: on
+
+// Auction (Note 1)
+// Feature became unstable on clients 2012 onwards (exact date not known),
+// it has been fixed on clients 2013-05-15 onwards however.
+feature.auction: off
diff --git a/conf/battle/guild.conf b/conf/battle/guild.conf
index cc22c327f..91c39fe71 100644
--- a/conf/battle/guild.conf
+++ b/conf/battle/guild.conf
@@ -16,9 +16,9 @@ guild_exp_limit: 50
 // Maximum castles one guild can own (0 = unlimited)
 guild_max_castles: 0
 
-// Activate guild skills delay by relog? (Note 1)
-// Official setting is "yes", otherwise allow guild leaders to relog to cancel the 5 minute delay.
-guild_skill_relog_delay: yes
+// Restart guild skills cooldown by relog? (Note 1)
+// When "no", you relog with the same cooldown remaining as from when you logged out, "yes" restarts the cooldown upon login to its full duration. 
+guild_skill_relog_delay: no
 
 // Damage adjustments for WOE battles against defending Guild monsters (Note 2)
 castle_defense_rate: 100
@@ -36,3 +36,14 @@ require_glory_guild: no
 // If you want to change this value, clear the guild alliance table.
 // Default is 3
 max_guild_alliance: 3
+
+// When to re-display the guild notice
+// Upon teleporting (regardless of changing maps): 2 (official)
+// Upon changing maps: 1
+// Do not re-display: 0 (disabled)
+guild_notice_changemap: 2
+
+// Can guild members invite/expel members inside guild castles in WoE/GvG? (Note 1)
+// default: no
+guild_castle_invite: no
+guild_castle_expulsion: no
\ No newline at end of file
diff --git a/conf/battle/homunc.conf b/conf/battle/homunc.conf
index fb34792ce..92c4b5fe8 100644
--- a/conf/battle/homunc.conf
+++ b/conf/battle/homunc.conf
@@ -18,7 +18,7 @@
 //        stat window (by default they don't crit)
 // 0x020: Their Min-Matk is always the same as their max
 // 0x040: Skill re-use delay is reset when they are vaporized.
-hom_setting: 0xFFFF
+hom_setting: 0x3D
 
 // The rate a homunculus will get friendly by feeding it. (Note 2)
 homunculus_friendly_rate: 100
@@ -35,7 +35,7 @@ homunculus_show_growth: yes
 // Does autoloot work, when a monster is killed by homunculus only?
 homunculus_autoloot: yes
 
-// Should homunculii Vaporize when Master dies?
+// Should homunculi Vaporize when Master dies?
 homunculus_auto_vapor: yes
 
 // Max level for regular Homunculus
diff --git a/conf/battle/items.conf b/conf/battle/items.conf
index 05aadfecd..2b342f4f2 100644
--- a/conf/battle/items.conf
+++ b/conf/battle/items.conf
@@ -79,10 +79,10 @@ autospell_stacking: no
 // Will disabled consumables (disabled by map_zone_db.conf) be consumed when trying to use them?
 // 1 (official): yes
 // 0: no
-item_restricted_consumption_type:1
+item_restricted_consumption_type: 1
 
 // Enable all NPC to allow changing of equipments while interacting? (Note 1)
 // Script commands 'enable_items/disable_items' will not be override. (see doc/script_commands.txt)
 // 1 : yes(official)
 // 0 : no
-item_enabled_npc:1
\ No newline at end of file
+item_enabled_npc: 1
diff --git a/conf/battle/misc.conf b/conf/battle/misc.conf
index 32b9c511e..dd3d57aaa 100644
--- a/conf/battle/misc.conf
+++ b/conf/battle/misc.conf
@@ -26,7 +26,7 @@ pk_mode: 0
 //  4: Disables commands usage
 //  8: Disables item usage/picking/dropping
 // 16: Disables room creation (chatrooms and vending shops)
-manner_system: 15
+manner_system: 31
 
 // For PK Server Mode. Change this to define the minimum level players can start PK-ing
 pk_min_level: 55
@@ -85,7 +85,7 @@ duel_only_on_same_map: no
 // Cell Stack Limit support (see src/map/map.h)
 cell_stack_limit: 1
 
-// Allow autrade only in map with autotrade flag?
+// Allow autotrade only in map with autotrade flag?
 // Set this to "no" will allow autotrade where no "autotrade" mapflag is set
 // Set this to "yes" to only allow autotrade on maps with "autotrade" mapflag
 at_mapflag: no
@@ -116,3 +116,22 @@ cashshop_show_points: no
 // 1 = Yes
 // 2 = Yes, when there are unread mails
 mail_show_status: 0
+
+// Is monster transformation disabled during Guild Wars?
+// If set to yes, monster transforming is automatically removed/disabled when entering castles during WoE times
+mon_trans_disable_in_gvg: no
+
+// Whether AegisName and SpriteName lookups are case sensitive
+// Default: yes (as in official servers)
+// When this is set to yes, item and monster lookups through atcommands and
+//   script commands will match AegisNames and SpriteNames only when the case
+//   matches. Display name lookups are not affected by this setting.
+// Example: Given the two items:
+// -  { Id: 553,  AegisName: "Bun",  Name: "Bao" }
+// -  { Id: 6115, AegisName: "Bun_", Name: "Bun" }
+// query       when 'yes'    when 'no'
+// @item bun   # 6115        # 553
+// @item Bun   # 553         # 553
+// @item Bao   # 553         # 553
+// @item Bun_  # 6115        # 6115
+case_sensitive_aegisnames: yes
diff --git a/conf/battle/monster.conf b/conf/battle/monster.conf
index 51136fbe0..50d661087 100644
--- a/conf/battle/monster.conf
+++ b/conf/battle/monster.conf
@@ -30,13 +30,13 @@ monster_max_aspd: 199
 //        (distance player/mob < 3), otherwise mobs may change target and chase 
 //        ranged attackers. This flag also overrides the 'provoke' target.
 // 0x008: If set, when a mob loses track of their target, they stop walking
-//        inmediately. Otherwise, they continue to their last target tile. When
+//        immediately. Otherwise, they continue to their last target tile. When
 //        set mobs also scatter as soon as they lose their target. Use this mode
 //        to make it much harder to mob-train by hiding and collecting them on a
 //        single spot (ie: GrimTooth training)
 // 0x010: If set, mob skills defined for friends will also trigger on themselves.
 // 0x020: When set, the monster ai is executed for all monsters in maps that 
-//        have players on them, instead of only for mobs who are in the vecinity
+//        have players on them, instead of only for mobs who are in the vicinity
 //        of players.
 // 0x040: When set, when the mob's target changes map, the mob will walk towards
 //        any npc-warps in it's sight of view (use with mob_warp below)
@@ -60,7 +60,7 @@ monster_ai: 0
 mob_warp: 0
 
 // If these are set above 0, they define the time (in ms) during which monsters
-// will have their 'AI' active after all players have left their vecinity.
+// will have their 'AI' active after all players have left their vicinity.
 mob_active_time: 0
 boss_active_time: 0
 
@@ -105,7 +105,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 inmediate 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
@@ -158,7 +158,7 @@ mob_changetarget_byskill: no
 monster_class_change_full_recover: yes
 
 // Display some mob info next to their name? (add as needed)
-// (does not works on guardian or emperium)
+// (does not works on guardian or Emperium)
 // 1: Display mob HP (Hp/MaxHp format)
 // 2: Display mob HP (Percent of full life format)
 // 4: Display mob's level
@@ -189,7 +189,7 @@ mob_remove_delay: 300000
 // NOTE: This affects who gains the Castle when the Emperium is broken. 
 mob_npc_event_type: 1
 
-// Time in milliseconds to actitave protection against Kill Steal
+// Time in milliseconds to activate protection against Kill Steal
 // Set to 0 to disable it.
 // If this is activated and a player is using @noks, damage from others players (KS) not in the party
 // will be reduced to 0.
diff --git a/conf/battle/party.conf b/conf/battle/party.conf
index 7339b2e3c..14d5f47c8 100644
--- a/conf/battle/party.conf
+++ b/conf/battle/party.conf
@@ -44,7 +44,7 @@ party_item_share_type: 0
 // A character's idle status is reset upon item use/skill use/attack (auto attack counts too)/movement.
 idle_no_share: no
 
-// Give additional experience bonus per party-member involved on even-share parties (excluding youself)?
+// Give additional experience bonus per party-member involved on even-share parties (excluding yourself)?
 // ex. If set to 10, an even-share party of 5 people will receive +40% exp (4 members * 10% exp):
 //     140% party experience in total, so each member receives 140%/5 = 28% exp (instead of 20%).
 party_even_share_bonus: 0
diff --git a/conf/battle/player.conf b/conf/battle/player.conf
index f493f6b67..cdfcece8d 100644
--- a/conf/battle/player.conf
+++ b/conf/battle/player.conf
@@ -5,6 +5,7 @@
 //--------------------------------------------------------------
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field.
 //--------------------------------------------------------------
 
 // Players' maximum HP rate? (Default is 100)
@@ -81,13 +82,16 @@ max_sp: 1000000
 max_parameter: 99
 
 // Same as max_parameter, but for 3rd classes.
-max_third_parameter: 120
+max_third_parameter: 130
+
+// Same as max_parameter, but for extend classes (Ex. Super Novice, Kagero/Oboro, Rebellion).
+max_extended_parameter: 125
 
 // Same as max_parameter, but for baby classes.
 max_baby_parameter: 80
 
 // Same as max_parameter, but for baby 3rd's.
-max_baby_third_parameter: 108
+max_baby_third_parameter: 117
 
 // Max armor def/mdef
 // NOTE: This setting have no effect if server is run on Renewal Mode (RENEWAL) 
@@ -142,4 +146,25 @@ idle_no_autoloot: 0
 
 // Minimum distance a vending/chat room must be from a NPC in order to be placed
 // Default: 3 (0: disabled).
-min_npc_vendchat_distance: 3
\ No newline at end of file
+min_npc_vendchat_distance: 3
+
+// Super Novice's fury is enabled to increments of 10%, such as at 10.0%, 20.0% - 80.0%, 90.0%
+// Changing snovice_call_type config to 1 enables its use at 0%, for maxed super novices.
+// default: 0
+snovice_call_type: 0
+
+// How the server should measure the character's idle time? (Note 3)
+// 0x001 - Walk Request
+// 0x002 - UseSkillToID Request ( targetted skill use attempt )
+// 0x004 - UseSkillToPos Request ( aoe skill use attempt )
+// 0x008 - UseItem Request ( including equip/unequip )
+// 0x010 - Attack Request
+// 0x020 - Chat Request ( whisper, party, guild, bg, etca )
+// 0x040 - Sit/Standup Request
+// 0x080 - Emotion Request
+// 0x100 - DropItem Request
+// 0x200 - @/#Command Request
+// Please note that at least 1 option has to be enabled.
+// Be mindful that the more options used, the easier it becomes to cheat features that rely on idletime (e.g. checkidle()).
+// Default: walk ( 0x1 ) + useskilltoid ( 0x2 ) + useskilltopos ( 0x4 ) + useitem ( 0x8 ) + attack ( 0x10 ) = 0x1F
+idletime_criteria: 0x1F
diff --git a/conf/battle/skill.conf b/conf/battle/skill.conf
index df419b262..849989709 100644
--- a/conf/battle/skill.conf
+++ b/conf/battle/skill.conf
@@ -20,7 +20,7 @@ delay_rate: 100
 delay_dependon_dex: no
 delay_dependon_agi: no
 
-// Minimum allowed delay for ANY skills after casting (in miliseconds) (Note 1)
+// Minimum allowed delay for ANY skills after casting (in milliseconds) (Note 1)
 // Note: Setting this to anything above 0 can stop speedhacks.
 min_skill_delay_limit: 100
 
@@ -37,7 +37,7 @@ default_walk_delay: 300
 //  min_skill_delay_limit.
 no_skill_delay: 2
 
-// At what dex does the cast time become zero (instacast)?
+// At what dex does the cast time become zero (instant cast)?
 castrate_dex_scale: 150
 
 // How much (dex*2+int) does variable cast turns zero?
@@ -91,7 +91,7 @@ defunit_not_enemy: no
 
 // Do skills do at least 'hits' damage when they don't miss/are blocked?
 //(for example, will firebolts always do "number of bolts" damage versus plants?)
-//Values (add as appropiate): 1 for weapon-based attacks, 2 for magic attacks, 4 for misc attacks.
+//Values (add as appropriate): 1 for weapon-based attacks, 2 for magic attacks, 4 for misc attacks.
 skill_min_damage: 6
 
 // The delay rate of monk's combo (Note 2)
@@ -128,7 +128,7 @@ traps_setting: 0
 summon_flora_setting: 3
 
 // Whether placed down skills will check walls (Note 1)
-// (Makes it so that Storm Gust/Lord of Vermillion/etc when casted next to a wall, won't hit on the other side) 
+// (Makes it so that Storm Gust/Lord of Vermillion/etc when cast next to a wall, won't hit on the other side) 
 skill_wall_check: yes
 
 // When cloaking, Whether the wall is checked or not. (Note 1)
@@ -138,8 +138,8 @@ skill_wall_check: yes
 // 
 // 0 = doesn't check for walls
 // 1 = Check for walls
-// 2 = Cloaking is not cancelled when attacking.
-// 4 = Cloaking is not cancelled when using skills
+// 2 = Cloaking is not canceled when attacking.
+// 4 = Cloaking is not canceled when using skills
 player_cloak_check_type: 1
 monster_cloak_check_type: 4
 
@@ -168,7 +168,7 @@ sense_type: 1
 // 1 = Athena style (multiple consecutive attacks)
 finger_offensive_type: 0
 
-// Grandcross Settings (Dont mess with these)
+// Grandcross Settings (Don't mess with these)
 // If set to no, hit interval is increased based on the amount of mobs standing on the same cell
 // (means that when there's stacked mobs in the same cell, they won't receive all hits)
 gx_allhit: no
@@ -212,7 +212,7 @@ berserk_cancels_buffs: no
 max_heal: 9999
 max_heal_lv: 11
 
-// Emergency Recall Guild Skill setting (add as appropiate).
+// Emergency Recall Guild Skill setting (add as appropriate).
 // Note that for the skill to be usable at all, 
 // you need at least one of 1/2 and 4/8
 // 1: Skill is usable outside of woe.
@@ -223,7 +223,7 @@ max_heal_lv: 11
 //    (it will work on GVG castles even if they are set to nowarpto, though)
 emergency_call: 11
 
-// Guild Aura Skills setting (add as appropiate).
+// Guild Aura Skills setting (add as appropriate).
 // (This affects GD_LEADERSHIP, GD_GLORYWOUNDS, GD_SOULCOLD and GD_HAWKEYES)
 // Note that for the skill to be usable at all, 
 // you need at least one of 1/2 and 4/8
@@ -258,7 +258,7 @@ sg_angel_skill_ratio: 10
 skill_add_heal_rate: 7
 
 // Whether the damage of EarthQuake with a single target on screen is able to be reflected.
-// Note: On offcial server, EQ is reflectable when there is only one target on the screen, 
+// Note: On official server, EQ is reflectable when there is only one target on the screen, 
 //	 which might be an exploit to hunt the MVPs.
 eq_single_target_reflectable: yes
 
@@ -279,4 +279,11 @@ skill_trap_type: 0
 
 // Max Possible Level of Monster skills
 // Note: If your MVPs are too tough, reduce it to 10.
-mob_max_skilllvl: 100
\ No newline at end of file
+mob_max_skilllvl: 100
+
+// Area of Bowling Bash chain reaction
+// 0: Use official gutter line system
+// 1: Gutter line system without demi gutter bug
+// 2-20: Area around caster (2 = 5x5, 3 = 7x7, 4 = 9x9, ..., 20 = 41x41)
+// Note: If you knock the target out of the area it will only be hit once and won't do splash damage
+bowling_bash_area: 0
\ No newline at end of file
diff --git a/conf/battle/status.conf b/conf/battle/status.conf
index 372619fd1..172706817 100644
--- a/conf/battle/status.conf
+++ b/conf/battle/status.conf
@@ -9,7 +9,7 @@
 //         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 //--------------------------------------------------------------
 
-// Should skill casting be cancelled when inflicted by curse/stun/sleep/etc (includes silence) (Note 3)?
+// Should skill casting be canceled when inflicted by curse/stun/sleep/etc (includes silence) (Note 3)?
 status_cast_cancel: 0
 
 // Adjustment for the natural rate of resistance from status changes.
diff --git a/conf/battlegrounds.conf b/conf/battlegrounds.conf
index b43899dd7..0aa81d35d 100644
--- a/conf/battlegrounds.conf
+++ b/conf/battlegrounds.conf
@@ -10,6 +10,15 @@
 //====================================================
 //= Link~u! <description> <link to wiki/topic>
 //= http://hercules.ws/board/topic/928-memory-slasher-may-30-patch/
+//====================================================
+//= Fields (TODO/INCOMPLETE)
+//= arenas: ({
+//=		//- allowedTypes defines what kind of applications the arena will accept, setting is not case-sensitive and is ok with whitespaces
+//= 		allowedTypes: "Solo | Party" //Arena Accepts solo and party-type joins
+//=     	allowedTypes: "guild|party" //Arena Accepts solo and guild-type joins
+//=			allowedTypes: "All" //Arena Accepts solo, party and guild-type joins
+//=		//- fillAnnounce (optional arena param)
+//= })
 battlegrounds: (
 {
 	/* feature is not complete */
@@ -24,6 +33,7 @@ battlegrounds: (
 	arenas: ({
 		name: "Tierra Gorge" //must match the name in client files
 		event: "Tierra_BG2::OnPlayerListReady"
+		allowedTypes: "All" /* Solo, Party and Guild */
 		minLevel: 80
 		maxLevel: 150
 		reward: {/* amount of badges awarded on each case */
@@ -34,11 +44,14 @@ battlegrounds: (
 		minPlayers: 6 /* minimum amount of players to start */
 		maxPlayers: 60 /* maximum amount of players */
 		minTeamPlayers: 6 /* minimum amount of team members required for a team (party or guild) to join */
-		delay_var: "Tierra_BG_Tick" /* npc variable name that will store the delay for this match */
+		delay_var: "Tierra_BG_Tick" /* char variable name that will store the delay for this match */
 		maxDuration: 30 /* maximum duration in minutes, if reached game ends and highest score wins (or calls a draw if scores are equal) */
+		fillDuration: 20 /* time in seconds to wait for more applications when minimum has been reached */
+		pGameDuration: 20 /* time to wait for players to confirm their attendence after queueing process has finished */
 	},{
 		name: "Flavius" //must match the name in client files
-		event: "Flavius_BG1::OnPlayerListReady"
+		event: "start#bat_b01::OnPlayerListReady"
+		allowedTypes: "All" /* Solo, Party and Guild */
 		minLevel: 80
 		maxLevel: 150
 		reward: {/* amount of badges awarded on each case */
@@ -46,14 +59,17 @@ battlegrounds: (
 			loss: 3
 			draw: 3
 		}
-		minPlayers: 6 /* minimum amount of players to start */
+		minPlayers: 2 /* minimum amount of players to start (DEBUG VALUE, CHANGE BACK) */
 		maxPlayers: 60 /* maximum amount of players */
 		minTeamPlayers: 6 /* minimum amount of team members required for a team (party or guild) to join */
-		delay_var: "Flavius_BG_Tick" /* npc variable name that will store the delay for this match */
+		delay_var: "Flavius_BG_Tick" /* char variable name that will store the delay for this match */
 		maxDuration: 30 /* maximum duration in minutes, if reached game ends and highest score wins (or calls a draw if scores are equal) */
+		fillDuration: 20 /* time in seconds to wait for more applications when minimum has been reached */
+		pGameDuration: 20 /* time to wait for players to confirm their attendence after queueing process has finished */
 	},{
 		name: "KVM (Level 80 and up)" //must match the name in client files
 		event: "KvM03_BG::OnPlayerListReady"
+		allowedTypes: "All" /* Solo, Party and Guild */
 		minLevel: 80
 		maxLevel: 150
 		reward: {/* amount of badges awarded on each case */
@@ -64,11 +80,14 @@ battlegrounds: (
 		minPlayers: 4 /* minimum amount of players to start */
 		maxPlayers: 60 /* maximum amount of players */
 		minTeamPlayers: 5 /* minimum amount of team members required for a team (party or guild) to join */
-		delay_var: "KVM_BG_Tick" /* npc variable name that will store the delay for this match */
+		delay_var: "KVM_BG_Tick" /* char variable name that will store the delay for this match */
 		maxDuration: 30 /* maximum duration in minutes, if reached game ends and highest score wins (or calls a draw if scores are equal) */
+		fillDuration: 20 /* time in seconds to wait for more applications when minimum has been reached */
+		pGameDuration: 20 /* time to wait for players to confirm their attendence after queueing process has finished */
 	},{
 		name: "KVM (Level 60~79)" //must match the name in client files
 		event: "KvM03_BG::OnPlayerListReady"
+		allowedTypes: "All" /* Solo, Party and Guild */
 		minLevel: 60
 		maxLevel: 79
 		reward: {/* amount of badges awarded on each case */
@@ -79,11 +98,14 @@ battlegrounds: (
 		minPlayers: 4 /* minimum amount of players to start */
 		maxPlayers: 60 /* maximum amount of players */
 		minTeamPlayers: 5 /* minimum amount of team members required for a team (party or guild) to join */
-		delay_var: "KVM_BG_Tick" /* npc variable name that will store the delay for this match */
+		delay_var: "KVM_BG_Tick" /* char variable name that will store the delay for this match */
 		maxDuration: 30 /* maximum duration in minutes, if reached game ends and highest score wins (or calls a draw if scores are equal) */
+		fillDuration: 20 /* time in seconds to wait for more applications when minimum has been reached */
+		pGameDuration: 20 /* time to wait for players to confirm their attendence after queueing process has finished */
 	},{
 		name: "KVM (Level 59 and below)" //must match the name in client files
 		event: "KvM03_BG::OnPlayerListReady"
+		allowedTypes: "All" /* Solo, Party and Guild */
 		minLevel: 1
 		maxLevel: 59
 		reward: {/* amount of badges awarded on each case */
@@ -94,8 +116,10 @@ battlegrounds: (
 		minPlayers: 4 /* minimum amount of players to start */
 		maxPlayers: 60 /* maximum amount of players */
 		minTeamPlayers: 5 /* minimum amount of team members required for a team (party or guild) to join */
-		delay_var: "KVM_BG_Tick" /* npc variable name that will store the delay for this match */
+		delay_var: "KVM_BG_Tick" /* char variable name that will store the delay for this match */
 		maxDuration: 30 /* maximum duration in minutes, if reached game ends and highest score wins (or calls a draw if scores are equal) */
+		fillDuration: 20 /* time in seconds to wait for more applications when minimum has been reached */
+		pGameDuration: 20 /* time to wait for players to confirm their attendence after queueing process has finished */
 	}
 	)
-})
\ No newline at end of file
+})
diff --git a/conf/channels.conf b/conf/channels.conf
index f17d2aed1..9700f626c 100644
--- a/conf/channels.conf
+++ b/conf/channels.conf
@@ -59,5 +59,6 @@ chsys: (
 	irc_channel_channel: "#Hercules" /* channel in the network above to join */
 	irc_channel_nick: "Hercules_chSysBot" /* nick the bot will use */
 	irc_channel_nick_pw: "" /* password to this nick (if any) to identify to nick server on the irc network */
+	irc_channel_use_ghost: false /* whether to send a GHOST command to the nick server (requires irc_channel_nick_pw to be defined) */
 }
-)
\ No newline at end of file
+)
diff --git a/conf/char-server.conf b/conf/char-server.conf
index b2120471c..aa3f7691c 100644
--- a/conf/char-server.conf
+++ b/conf/char-server.conf
@@ -64,8 +64,11 @@ console_silent: 0
 // Type of server.
 // No functional side effects at the moment.
 // Displayed next to the server name in the client.
-// 0=normal, 1=maintenance, 2=over 18, 3=paying, 4=P2P
-char_maintenance: 0
+// 0=normal, 1=maintenance, 2=over 18, 3=paying, 4=F2P
+char_server_type: 0
+
+// Minimum Group ID to join char server when it is on char_server_type 1 (maintenance)
+char_maintenance_min_group_id: 99
 
 // Enable or disable creation of new characters.
 // Now it is actually supported [Kevin]
@@ -95,8 +98,11 @@ save_log: yes
 start_point: new_1-1,53,111
 
 // Starting items for new characters
-// Format is: id1,qt1,idn,qtn
-start_items: 1201,1,2301,1
+// Format is: id1,quantity1,stackable1,idN,quantityN,stackableN
+// stackable:
+//		0 - Not stackable (weapon, armor, egg, pet armor)
+//		1 - Stackable
+start_items: 1201,1,0,2301,1,0
 
 // Starting zeny for new characters
 start_zeny: 0
@@ -144,11 +150,16 @@ char_del_level: 0
 // NOTE: Requires client 2010-08-03aragexeRE or newer.
 char_del_delay: 86400
 
-// What folder the DB files are in (item_db.txt, etc.)
+// Block deletion if character is inside a guild or a party? (BOOL)
+// default: 0	official: 1
+// !!This check is imposed by Aegis to avoid dead entries in databases and _is_not_needed_ as we clear data properly!!
+char_aegis_delete: 0
+
+// What folder the DB files are in (item_db.conf, etc.)
 db_path: db
 
 //==================================================================
-// Pincode system -- INCOMPLETE / BROKEN
+// Pincode system
 //==================================================================
 
 // A window is opened before you can select your character and you will have to enter a pincode by using only your mouse
diff --git a/conf/groups.conf b/conf/groups.conf
index 7c97352dc..d31f46f24 100644
--- a/conf/groups.conf
+++ b/conf/groups.conf
@@ -120,6 +120,7 @@ groups: (
 		noks: true
 		autoloot: true
 		alootid: true
+		autoloottype: true
 		autotrade: true
 		request: true
 		go: true
@@ -260,6 +261,7 @@ groups: (
 	log_commands: true
 	permissions: {
 		can_trade: true
+		can_trade_bound: false
 		can_party: true
 		all_skill: false
 		all_equipment: false
diff --git a/conf/help.txt b/conf/help.txt
index 16e7c2981..a65c7de70 100644
--- a/conf/help.txt
+++ b/conf/help.txt
@@ -32,7 +32,7 @@ mobsearch: "Params: <monster name|ID>\n" "Shows the location of a certain mob on
 who: "Params: [<name>]\n" "Shows a list of online players and their party and guild."
 who2: "Params: [<name>]\n" "Shows a list of online players and their job."
 who3: "Params: [<name>]\n" "Shows a list of online players and their location."
-whomap: "@whomap/@whomap2/@whomap3 [map] - like @who/@who2/@who3 but only for specifical map."
+whomap: "@whomap/@whomap2/@whomap3 [map] - like @who/@who2/@who3 but only for specified map."
 whogm: "Params: [match_text] - Like @who+@who2+who3, but only for GM."
 guildspy: "Params: <guild name|id> - You will receive all messages of the guild channel (Chat logging must be enabled)"
 partyspy: "@partyspy <party name|id> - You will receive all messages of the party channel (Chat logging must be enabled)"
@@ -102,7 +102,7 @@ jobchange: "Params: <job name|ID>\n" "Changes your job.\n"
 	"     23 Super Novice      24 Gunslinger              25 Ninja                 4045 Super Baby\n"
 	"4046 Taekwon           4047 Star Gladiator     4049 Soul Linker            4050 Gangsi\n"
 	"4051 Death Knight    4052 Dark Collector    4190 Ex. Super Novice  4191 Ex. Super Baby\n"
-	"4211 Kagerou            4212 Oboro\n"
+	"4211 Kagerou            4212 Oboro            4215 Rebellion\n"
 	"----- Baby Novice And Baby 1st Class -----\n"
 	"4023 Baby Novice      4024 Baby Swordman    4025 Baby Magician   4026 Baby Archer\n"
 	"4027 Baby Acolyte      4028 Baby Merchant       4029 Baby Thief\n"
@@ -221,7 +221,7 @@ request: "Params: <message>\n" "Sends a message to all connected GMs (via the gm
 sound: "Params: <path to file in data folder or GRF file>\n" "Plays a sound from the data folder or GRF file located on the client."
 clone: "Params: <charname>\n" "Spawns a supportive clone of the given player."
 slaveclone: "Params: <charname>\n" "Spawns a supportive clone of the given player that follows the creator around."
-evilclone: "Params: <charname>\n" "Spawns an agressive clone of the given player."
+evilclone: "Params: <charname>\n" "Spawns an aggressive clone of the given player."
 changesex: "Changes your gender."
 duel: "Starts a duel."
 invite: "Invites a player to a duel."
@@ -300,3 +300,8 @@ reloadscript: "Reload all scripts."
 gat: "For debugging (you inspect around gat)"
 send: "For debugging (packet variety)"
 nuke: "Params: <char name>\n" "Blow somebody up, including those surrounding them."
+autoloottype: "Manage a list of autolooting item types.\n"
+" To add an item type to the list, use \"@autoloottype +<type name>\".\n"
+" To remove an item type, use \"@autoloottype -<type name>\".\n"
+" Type List: healing, usable, etc, weapon, armor, card, petegg, petarmor, ammo.\n"
+" \"@autoloottype reset\" will clear your autoloottype list."
diff --git a/conf/inter-server.conf b/conf/inter-server.conf
index 0e9808077..184285cfd 100644
--- a/conf/inter-server.conf
+++ b/conf/inter-server.conf
@@ -24,7 +24,7 @@ party_share_level: 15
 // and you have localhost, switch it to 127.0.0.1
 
 // Global SQL settings
-// overriden by local settings when the hostname is defined there
+// overridden by local settings when the hostname is defined there
 // (currently only the login-server reads/obeys these settings)
 sql.db_hostname: 127.0.0.1
 sql.db_port: 3306
@@ -76,6 +76,8 @@ mysql_reconnect_count:1
 
 //Shared
 interreg_db: interreg
+global_acc_reg_num_db: global_acc_reg_num_db
+global_acc_reg_str_db: global_acc_reg_str_db
 
 // Char Database Tables
 char_db: char
@@ -85,7 +87,6 @@ cart_db: cart_inventory
 inventory_db: inventory
 charlog_db: charlog
 storage_db: storage
-reg_db: global_reg_value
 skill_db: skill
 interlog_db: interlog
 memo_db: memo
@@ -108,6 +109,12 @@ skill_homunculus_db: skill_homunculus
 mercenary_db: mercenary
 mercenary_owner_db: mercenary_owner
 ragsrvinfo_db: ragsrvinfo
+elemental_db: elemental
+account_data_db: account_data
+acc_reg_num_db: acc_reg_num_db
+acc_reg_str_db: acc_reg_str_db
+char_reg_str_db: char_reg_str_db
+char_reg_num_db: char_reg_num_db
 
 // Map Database Tables
 item_db_db: item_db
@@ -118,8 +125,28 @@ mob_db2_db: mob_db2
 mob_skill_db_db: mob_skill_db
 mob_skill_db2_db: mob_skill_db2
 mapreg_db: mapreg
-
-//Use SQL item_db, mob_db and mob_skill_db for the map server
-use_sql_db: no
+autotrade_merchants_db: autotrade_merchants
+autotrade_data_db: autotrade_data
+npc_market_data_db: npc_market_data
+
+// == SQL item, mob, mob skill databases
+// =====================================
+// Note: the following databases may get out of date at times, or not be
+// thoroughly tested (if at all, since they're auto-generated). As such it is
+// not advisable to rely on them other than for informative reasons (Control
+// Panels, websites, etc.)
+// Unless you know what you're doing, please consider using their txt version.
+// Note2: It is perfectly legit (and recommended) to use txt databases in
+// Hercules, while still loading the SQL tables we provide to be used
+// exclusively by your Control Panel or Website.
+
+// Use SQL for item_db? (not recommended)
+use_sql_item_db: no
+
+// Use SQL for mob_db? (not recommended)
+use_sql_mob_db: no
+
+// Use SQL for mob_skill_db? (not recommended)
+use_sql_mob_skill_db: no
 
 import: conf/import/inter_conf.txt
diff --git a/conf/login-server.conf b/conf/login-server.conf
index 8f2fa1bf1..06e0eb18b 100644
--- a/conf/login-server.conf
+++ b/conf/login-server.conf
@@ -25,7 +25,7 @@ login_port: 6900
 //If redirected output contains escape sequences (color codes)
 stdout_with_ansisequence: no
 
-//Makes server output more silent by ommitting certain types of messages:
+//Makes server output more silent by omitting certain types of messages:
 //1: Hide Information messages
 //2: Hide Status messages
 //4: Hide Notice Messages
@@ -47,9 +47,6 @@ new_acc_length_limit: yes
 allowed_regs: 1
 time_allowed: 10
 
-// Log Filename. All operations received by the server are logged in this file. 
-login_log_filename: log/login.log
-
 // To log the login server?
 // NOTE: The login-sql server needs the login logs to enable dynamic pass failure bans.
 log_login: yes
@@ -123,10 +120,6 @@ dnsbl_servers: bl.blocklist.de, socks.dnsbl.sorbs.net
 // socks.dnsbl.sorbs.net           Open SOCKS proxy servers
 // tor.ahbl.org                    Current tor relay and exit nodes
 
-// Which account engine to use.
-// 'auto' selects the first engine available (txt, sql, then others)
-// (defaults to auto)
-account.engine: auto
 
 // Account data storage configuration
 // SQL
@@ -143,14 +136,21 @@ account.engine: auto
 // Client MD5 hash check
 // If turned on, the login server will check if the client's hash matches
 // the value below, and will not connect tampered clients.
-// Note: see doc\md5_hashcheck.txt for more details.
+// Note: see doc/md5_hashcheck.txt for more details.
 client_hash_check: off
 
 // Client MD5 hashes
-// A player can login with a client hash at or below the account group_id.
+// The client with the specified hash can be used to log in by players with
+// a group_id equal to or greater than the given value.
+// If you specify 'disabled' as hash, players with a group_id greater than or
+// equal to the given value will be able to log in regardless of hash (and even
+// if their client does not send a hash at all.)
 // Format: group_id, hash
-client_hash: 0, 113e195e6c051bb1cfb12a644bb084c5
-client_hash: 99, cb1ea78023d337c38e8ba5124e2338ae
+// Note: see doc/md5_hashcheck.txt for more details.
+//client_hash: 0, 113e195e6c051bb1cfb12a644bb084c5
+//client_hash: 10, cb1ea78023d337c38e8ba5124e2338ae
+//client_hash: 99, disabled
+
 
 import: conf/inter-server.conf
 import: conf/import/login_conf.txt
diff --git a/conf/logs.conf b/conf/logs.conf
index 2aeb1b52e..6933e84fe 100644
--- a/conf/logs.conf
+++ b/conf/logs.conf
@@ -25,7 +25,8 @@
 // 0x02000 - (E) Log mail system transactions.
 // 0x04000 - (I) Log auction system transactions.
 // 0x08000 - (B) Log buying store transactions
-// 0x10000 - (X) Log all other transcations (rentals expiring/inserting cards/items removed by item_check/
+// 0x20000 - (K) Log account bank transactions
+// 0x10000 - (X) Log all other transactions (rentals expiring/inserting cards/items removed by item_check/
 //           rings deleted by divorce/pet egg (un)hatching/pet armor (un)equipping/Weapon Refine skill/Remove Trap skill)
 // Example: Log trades+vending+script items+created items: 1+2+32+1024 = 1059
 // Please note that moving items from inventory to cart and back is not logged by design.
@@ -77,7 +78,7 @@ log_branch: no
 
 // Track Zeny Changes
 // Filter settings
-// 0 - don't log; 1 - log any zeny changes; 2.....1000000 - minimal absolut logging zeny value
+// 0 - don't log; 1 - log any zeny changes; 2.....1000000 - minimal absolute logging zeny value
 log_zeny: 0
 
 // Log MVP Monster Drops (Note 1)
diff --git a/conf/map-server.conf b/conf/map-server.conf
index 446bb0d0e..a3afde66c 100644
--- a/conf/map-server.conf
+++ b/conf/map-server.conf
@@ -55,7 +55,7 @@ stdout_with_ansisequence: no
 //Messages logged by this overrides console_silent setting
 console_msg_log: 0
 
-//Makes server output more silent by ommitting certain types of messages:
+//Makes server output more silent by omitting certain types of messages:
 //1: Hide Information messages
 //2: Hide Status messages
 //4: Hide Notice Messages
@@ -97,11 +97,12 @@ minsave_time: 100
 // 32: After successfully submitting an item for auction
 // 64: After successfully get/delete/complete a quest
 // 128: After every buying store transaction
+// 256: After every bank transaction (deposit/withdraw)
 // NOTE: These settings decrease the chance of dupes/lost items when there's a
 // server crash at the expense of increasing the map/char server lag. If your 
 // server rarely crashes, but experiences interserver lag, you may want to set
 // these off.
-save_settings: 255
+save_settings: 511
 
 // When @help or @h is typed when you are a gm, this is displayed for helping new gms understand gm commands.
 help_txt: conf/help.txt
diff --git a/conf/messages.conf b/conf/messages.conf
index e2886a57d..d9d4e9411 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -12,9 +12,10 @@
 // msg_number: translated message
 //============================================================
 
-//  0-410: reserved for GM commands
-// 500-900 reserved for others
-// 900-1300: @atcommand
+//  0-499: reserved for GM commands
+// 500-549: reserved for others
+// 550-699: reserved for job names (also loaded by char server)
+// 900-1500: @atcommand
 
 // To disable a string (%s) field, make it's max length 0:
 // eg:
@@ -39,7 +40,7 @@
 12: Your job has been changed.
 13: You've died.
 14: Character killed.
-15: Player warped (message sent to player too).
+15: Unknown
 16: You've been revived!
 17: HP, SP recovered.
 18: Item created.
@@ -50,8 +51,7 @@
 23: Job level can't go any higher.
 24: Job level raised.
 25: Job level lowered.
-26: Help commands:
-27: Commands help is not available.
+//26-27 FREE
 28: No player found.
 29: 1 player found.
 30: %d players found.
@@ -59,7 +59,7 @@
 32: PvP: On.
 33: GvG: Off.
 34: GvG: On.
-35: You can't use this command with this class.
+//35 FREE
 36: Appearance changed.
 37: An invalid number was specified.
 38: Invalid location number, or name.
@@ -72,28 +72,19 @@
 45: Guild level change failed.
 46: %s recalled!
 47: Base level can't go any higher.
-48: Character's job changed.
-49: Invalid job ID.
-50: You already have some GM powers.
-51: Character revived.
-52: This option cannot be used in PK Mode.
+//48-52 FREE
 53: '%s' stats:
 54: No player found in map '%s'.
 55: 1 player found in map '%s'.
 56: %d players found in map '%s'.
-57: Character's save point changed.
-58: Character's options changed.
+//57-58 FREE
 59: Night Mode Activated.
 60: Day Mode Activated.
 61: The holy messenger has given judgement.
 62: Judgement has passed.
 63: Mercy has been shown.
 64: Mercy has been granted.
-65: Character's base level raised.
-66: Character's base level lowered.
-67: Character's job level can't go any higher.
-68: character's job level raised.
-69: Character's job level lowered.
+//65-69 FREE
 70: You have learned the skill.
 71: You have forgotten the skill.
 72: War of Emperium has been initiated.
@@ -101,21 +92,19 @@
 74: War of Emperium has been ended.
 75: War of Emperium is currently not in progress.
 76: All skills have been added to your skill tree.
-77: The reference result of '%s' (name: id):
+77: Search results for '%s' (name: id):
 78: %s: %d
-79: It is %d affair above.
-80: Give the display name or monster name/id please.
-81: Your GM level doesn't authorize you to preform this action on the specified player.
-82: Please provide a name or number from the list provided:
-83: Monster 'Emperium' cannot be spawned.
+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
 84: All stats changed!
 85: Invalid time for ban command.
-86: Sorry, player names have to be at least 4 characters.
-87: Sorry, player names can be no longer than 23 characters.
+//86-87 FREE
 88: Sending request to login server...
 89: Night mode is already enabled.
 90: Day mode is already enabled.
-91: Character's base level can't go any higher.
+//91 FREE
 92: All characters recalled!
 93: All online characters of the %s guild have been recalled to your position.
 94: Incorrect name/ID, or no one from the specified guild is online.
@@ -125,7 +114,7 @@
 98: Monster database has been reloaded.
 99: Skill database has been reloaded.
 100: Scripts have been reloaded.
-101: Login-server asked to reload GM accounts and their level.
+//101 FREE
 102: You have mounted a Peco Peco.
 103: No longer spying on the %s guild.
 104: Spying on the %s guild.
@@ -141,14 +130,14 @@
 114: %d item(s) removed from the player.
 115: %d item(s) removed. Player had only %d on %d items.
 116: Character does not have the specified item.
-117: You have been placed in jail by a GM.
+117: You have been jailed by a GM.
 118: Player warped to jail.
 119: This player is not in jail.
 120: A GM has discharged you from jail.
 121: Player unjailed.
 122: Disguise applied.
 123: Invalid Monster/NPC name/ID specified.
-124: Undisguise applied.
+124: Disguise removed.
 125: You're not disguised.
 //Clone Messages
 126: Cannot clone a player of higher GM level than yourself.
@@ -159,15 +148,12 @@
 131: Unable to spawn clone.
 132: Slave clone spawned.
 133: Unable to spawn slave clone.
-//Messages 134-139 are no longer used, available for future reuse (preferrable for more variations of @clone)
-140: Character's disguise applied.
-141: Character's undisguise applied.
-142: Character is not disguised.
-143: Commands are disabled on this map.
-144: Invalid e-mail. If you have default e-mail, type a@a.com.
-145: Invalid new e-mail. Please enter a real e-mail.
-146: New e-mail must be a real e-mail.
-147: New e-mail must be different from the current e-mail.
+//134-142 FREE (possibly for other clone types)
+143: Commands are disabled in this map.
+144: Invalid e-mail. If your email hasn't been set, use a@a.com.
+145: Invalid new e-mail. Please enter a real e-mail address.
+146: New e-mail must be a real e-mail address.
+147: New e-mail must be different from the current e-mail address.
 148: Information sent to login-server via char-server.
 149: Impossible to increase the number/value.
 150: No GM found.
@@ -184,7 +170,7 @@
 161: PvP is already On.
 162: GvG is already Off.
 163: GvG is already On.
-164: Your memo point #%d doesn't exist.
+//164 FREE
 165: All monsters killed!
 166: No item has been refined.
 167: 1 item has been refined.
@@ -192,8 +178,8 @@
 169: The item (%d: '%s') is not equipable.
 170: The item is not equipable.
 171: %d - void
-//172: You replace previous memo position %d - %s (%d,%d).
-//173: Note: you don't have the 'Warp' skill level to use it.
+172: Speed returned to normal.
+//173 FREE
 174: Number of status points changed.
 175: Number of skill points changed.
 176: Current amount of zeny changed.
@@ -209,71 +195,60 @@
 186: Pet hunger is already at maximum.
 187: You can now rename your pet.
 188: You can already rename your pet.
-189: This player can now rename his/her pet.
-190: This player can already rename his/her pet.
-191: Sorry, but this player has no pet.
-192: Unable to change the specified character's job.
-193: Character's base level can't go any lower.
-194: Character's job level can't go any lower.
+//189-194 FREE
 195: All players have been kicked!
 196: You already have this quest skill.
 197: This skill number doesn't exist or isn't a quest skill.
 198: This skill number doesn't exist.
-199: This player has learned the skill.
-200: This player already has this quest skill.
+//199-200 FREE
 201: You don't have this quest skill.
-202: This player has forgotten the skill.
-203: This player doesn't have this quest skill.
+//202-203 FREE
 204: You can't open a shop on this cell.
 205: Maybe you meant: 
 206: '%s' skill points reset.
 207: '%s' stats points reset.
 208: '%s' skill and stat points have been reset.
-209: Character's skill points changed.
-210: Character's status points changed.
-211: Character's current zeny changed.
+//209-211 FREE
 212: Cannot mount while in disguise.
-213: You can not mount a Peco Peco with your current job.
+213: You need %s to mount!
 214: You have released your Peco Peco.
-215: This player cannot mount a Peco Peco while in disguise.
-216: This player has mounted a Peco Peco.
-217: This player cannot mount a Peco Peco with his/her current job.
-218: This player's Peco Peco has been released.
+215: Your class can't mount!
+//216-218 FREE
 219: %d day
 220: %d days
-221: %s %d hour
-222: %s %d hours
-223: %s %d minute
-224: %s %d minutes
-225: %s and %d second
-226: %s and %d seconds
-227: Party modification is disabled on this map.
-228: Guild modification is disabled on this map.
+221: %d hour
+222: %d hours
+223: %d minute
+224: %d minutes
+225:  and %d second
+226:  and %d seconds
+227: Party modification is disabled in this map.
+228: Guild modification is disabled in this map.
 229: Your effect has changed.
 230: Server time (normal time): %A, %B %d %Y %X.
 231: Game time: The game is in permanent daylight.
 232: Game time: The game is in permanent night.
 233: Game time: The game is in night for %s.
-234: Game time: After, the game will be in permanent daylight.
+//234 FREE
 235: Game time: The game is in daylight for %s.
-236: Game time: After, the game will be in permanent night.
+//236 FREE
 237: Game time: After, the game will be in night for %s.
 238: Game time: A day cycle has a normal duration of %s.
 239: Game time: After, the game will be in daylight for %s.
 240: %d monster(s) summoned!
 241: You can now attack and kill players freely.
 242: You can now be attacked and killed by players.
-243: Skills have been disabled on this map.
-244: Skills have been enabled on this map.
+243: Skills have been disabled in this map.
+244: Skills have been enabled in this map.
 245: Server Uptime: %ld days, %ld hours, %ld minutes, %ld seconds.
-246: Your GM level doesn't authorize you to preform this action.
+246: Your GM level doesn't authorize you to perform this action.
 247: You are not authorized to warp to this map.
 248: You are not authorized to warp from your current map.
 249: You are not authorized to warp to your save map.
 250: You have already opened your storage. Close it first.
 251: You have already opened your guild storage. Close it first.
 252: You are not in a guild.
-//253: You are not authorized to memo this map.
+253: You already are at your destination!
 254: GM command configuration has been reloaded.
 255: Battle configuration has been reloaded.
 256: Status database has been reloaded.
@@ -287,38 +262,43 @@
 264: This item cannot be stored.
 265: %s has bought your item(s).
 266: Some of your items cannot be vended and were removed from the shop.
-267: '%s' designated maps reset.
-268: Reloaded the Message of the Day.
+//267-268 FREE
 269: Displaying first %d out of %d matches
 //@me output format
 270: * :%s %s: *
-271: You can't drop items on this map
-272: You can't trade on this map
-273: Commands available:
+271: You can't drop items in this map
+272: You can't trade in this map
+273: Available commands:
 274: %d commands found.
-275: No commands found.
-276: You can't open a shop on this map
+//275 FREE
+276: You can't open a shop in this map
 277: Usage: @request <petition/message to online GMs>.
 278: (@request): %s
 279: @request sent.
 280: Invalid name.
-281: You can't create chat rooms on this map
+281: You can't create chat rooms in this map
 //Party-related
 282: You need to be a party leader to use this command.
 283: Target character must be online and in your current party.
 284: Leadership transferred.
 285: You've become the party leader.
 286: There's been no change in the setting.
-287: You cannot change party leaders on this map.
+287: You cannot change party leaders in this map.
 //Missing stuff for @killer related commands.
 288: You are no longer killable.
-289: The player is now killable.
-290: The player is no longer killable.
-291: Weather effects will dispell on warp/refresh
+//289-290 FREE
+291: Weather effects will disappear after teleporting or refreshing.
 292: Killer state reset.
+//Item Bind System
+293: This bound item cannot be traded to that character.
+294: This bound item cannot be stored there.
+295: Please enter an item name or ID (usage: @itembound <item name/ID> <quantity> <bound_type>).
+296: Please enter all parameters (usage: @itembound2 <item name/ID> <quantity>
+297:   <identify_flag> <refine> <attribute> <card1> <card2> <card3> <card4> <bound_type>).
+298: Invalid bound type. Valid types are - 1:Account 2:Guild 3:Party 4:Character
+//299 FREE
 // Guild Castles Number
 // --------------------
-//299: ?? Castles
 300: None Taken
 301: One Castle
 302: Two Castles
@@ -356,17 +336,20 @@
 // 334: Thirty-Four Castles
 334: Total Domination
 
+//335-342 FREE
+
 // Templates for @who output
 343: Name: %s 
 344: (%s) 
 345: | Party: '%s' 
 346: | Guild: '%s'
-//You may ommit the last %s, then you won't see players job name
+//You may omit the last %s, then you won't see players job name
 347: | Lv:%d/%d | Job: %s
-//You may ommit 2 last %d, then you won't see players coords, just map name
+//You may omit 2 last %d, then you won't see players coordinates, just map name
 348: | Location: %s %d %d
+//349 FREE
 
-// @duel (part 1)
+// @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.
@@ -381,9 +364,9 @@
 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 on the same map.
-365: Duel: Can't use %s in duel. 
-// @duel (part 2)
+364: Duel: You can't invite %s because he/she isn't in the same map.
+365: Duel: Can't use %s in duel.
+//366-369 FREE
 370:  -- Duels: %d/%d, Members: %d/%d, Max players: %d --
 371:  -- Duels: %d/%d, Members: %d/%d --
 372:  -- Duel has been created (Use @invite/@leave) --
@@ -392,16 +375,10 @@
 375:  <- Player %s has left the duel --
 376:  -> Player %s has accepted the duel --
 377:  -- Player %s has rejected the duel --
+//378-385 FREE
 // Main chat
-380: Main chat has been activated.
-381: Main chat already activated.
-382: Main chat has been disabled.
-383: Main chat already disabled.
-384: Main chat is currently enabled. Usage: @main <on|off>, @main <message>.
-385: Main chat is currently disabled. Usage: @main <on|off>, @main <message>.
 386: %s :Main: %s
-387: You cannot use Main chat while muted.
-388: You should enable main chat with "@main on" command.
+//387-389 FREE
 //NoAsk
 390: Autorejecting is activated.
 391: Autorejecting is deactivated.
@@ -412,18 +389,19 @@
 396: Autorejected alliance request from %s.
 397: Autorejected opposition request from %s.
 398: Autorejected friend request from %s.
+//399 FREE
 400: Usage: @jailfor <time> <character name>
-401: You have been jailed for %d years, %d months, %d days, %d hours and %d minutes
+//401 FREE
 402: %s in jail for %d years, %d months, %d days, %d hours and %d minutes
 // WoE SE (@agitstart2)
 403: War of Emperium SE has been initiated.
 404: War of Emperium SE is currently in progress.
 405: War of Emperium SE has been ended.
 406: War of Emperium SE is currently not in progress.
-//407 free
+//407 FREE
 //chrif related
-408: Need disconnection to perform change-sex request...
-409: Your sex has been changed (need disconnection by the server)...
+408: Disconnecting to perform change-sex request...
+409: Your sex has been changed (disconnection required to complete the process)...
 //410-411 used by cash shop
 412: Your account has 'Unregistered'.
 413: Your account has an 'Incorrect Password'...
@@ -433,68 +411,76 @@
 417: Your Game's EXE file is not the latest version.
 418: Your account has been prohibited to log in.
 419: Server is jammed due to over populated.
-420: Your account has not more authorised.
+420: Your account has not more authorized.
 421: Your account has been totally erased.
+//422 FREE
 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 don't authorise you to %s the player '%.*s'.
+426: Your GM level doesn't authorize you to %s the player '%.*s'.
 427: Login-server is offline. Impossible to %s the player '%.*s'.
 428: block
 429: ban
 430: unblock
 431: unban
 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
 // Homunculus messages
 450: You already have a homunculus
 
 // Return pet to egg message
 451: You can't return your pet because your inventory is full.
+//452-497 FREE
 
 // Messages of others (not for GM commands)
 // ----------------------------------------
 
-//500: FREE
+// @itembound / @itembound2
+498: Cannot create bound pet eggs or pet armors.
+
+//499-500 FREE
 501: Your account time limit is: %d-%m-%Y %H:%M:%S.
 502: Day Mode is activated
 503: Night Mode is activated
 
 // Cash point change messages
-504: Used %d kafra points and %d cash points. %d kafra and %d cash points remaining.
+504: Used %d Kafra points and %d cash points. %d Kafra and %d cash points remaining.
 505: Gained %d cash points. Total %d points.
-506: Gained %d kafra points. Total %d points.
+506: Gained %d Kafra points. Total %d points.
 410: Removed %d cash points. Total %d points.
-411: Removed %d kafra points. Total %d points.
+411: Removed %d Kafra points. Total %d points.
 
 // Trade Spoof Messages
 507: This player has been banned for %d minute(s).
 508: This player hasn't been banned (Ban option is disabled).
-//509 Available....
+//509 FREE
 
 // mail system
 //----------------------
 510: You have %d new emails (%d unread)
+//511-537 FREE
 
-// Bot detect messages (currently unused)
-535: Possible use of BOT (99%% of chance) or modified client by '%s' (account: %d, char_id: %d). This player ask your name when you are hidden.
-
-536: Character '%s' (account: %d) is trying to use a bot (it tries to detect a fake player).
-537: Character '%s' (account: %d) is trying to use a bot (it tries to detect a fake mob).
 // Trade Spoof Messages
 538: Hack on trade: character '%s' (account: %d) try to trade more items that he has.
 539: This player has %d of a kind of item (id: %d), and tried to trade %d of them.
-540: This player has been definitivly blocked.
+540: This player has been definitively blocked.
 // Rare Items Drop/Steal announce
 541: '%s' got %s's %s (chance: %0.02f%%)
 //541: %.0s%.0sSomeone got %s
 542: '%s' stole %s's %s (chance: %0.02f%%)
 //542: %.0s%.0sSomeone stole %s
-// 543~548 are not used (previously @away messages)
+//543-545 FREE
+// @showmobs
+546: Please enter a mob name/id (usage: @showmobs <mob name/id>)
+547: Invalid mob name %s!
+// @clearcart
+548: You can't clean a cart while vending!
 // @Autotrade
-549: You should have a shop open to use @autotrade.
+549: You should have a shop open in order to use @autotrade.
 
-//550 -> 650: Job Names
+//550 -> 699: Job Names
 550: Novice
 551: Swordsman
 552: Magician
@@ -531,18 +517,18 @@
 583: High Priest
 584: High Wizard
 585: Whitesmith
-//585: Mastersmith //IRO name
+//585: Mastersmith //iRO name
 586: Sniper
 587: Assassin Cross
 588: Paladin
 589: Champion
 590: Professor
-//590: Scholar //IRO name
+//590: Scholar //iRO name
 591: Stalker
 592: Creator
-//592: Biochemist //IRO Name
+//592: Biochemist //iRO Name
 593: Clown
-//593: Minstrel //IRO Name
+//593: Minstrel //iRO Name
 594: Gypsy
 595: Baby Novice
 596: Baby Swordsman
@@ -568,8 +554,8 @@
 616: Taekwon
 617: Star Gladiator
 618: Soul Linker
-//619: FREE
-//620: FREE
+//619 FREE
+620: Unknown Job
 621: Summer
 622: Gangsi
 623: Death Knight
@@ -583,11 +569,11 @@
 631: Royal Guard
 632: Sorcerer
 633: Minstrel
-//633: Maestro //IRO Name
+//633: Maestro //iRO Name
 634: Wanderer
 635: Sura
 636: Genetic
-//636: Geneticist //IRO Name
+//636: Geneticist //iRO Name
 637: Shadow Chaser
 638: Baby Rune Knight
 639: Baby Warlock
@@ -606,53 +592,54 @@
 652: Expanded Super Baby
 653: Kagerou
 654: Oboro
-655: Unknown Job
+655: Rebellion
+
+656: Rune Knight T
+657: Warlock T
+658: Ranger T
+659: Arch Bishop T
+660: Mechanic T
+661: Guillotine Cross T
+662: Royal Guard T
+663: Sorcerer T
+664: Minstrel T
+665: Wanderer T
+666: Sura T
+667: Genetic T
+668: Shadow Chaser T
+
+//669-855 FREE (please start using from the top if you need, leave the 669+ range for new jobs)
 
 // MvP Tomb
-// Added here so it can be easily translated
-656: Tomb
-657: [ ^EE0000%s^000000 ]
-658: Has met its demise
-659: Time of death : ^EE0000%s^000000
-660: Defeated by
-661: [^EE0000%s^000000]
+856: Tomb
+857: [ ^EE0000%s^000000 ]
+858: Has met its demise
+859: Time of death : ^EE0000%s^000000
+860: Defeated by
+861: [^EE0000%s^000000]
 
 // Etc messages from source
-662: You're too close to a NPC, you must be at least %d cells away from any NPC.
-663: Duel: Can't use this item in duel.
-664: You cannot use this command when dead.
-665: Can't create chat rooms in this area.
-666: Pets are not allowed in Guild Wars.
-667: You're not dead.
-668: Your actual memo positions are:
-669: You broke the target's weapon.
-670: You can't leave battleground guilds.
-671: Friend already exists.
-672: Name not found in list.
-673: This action can't be performed at the moment. Please try again later.
-674: Friend removed.
-675: Cannot send mails too fast!!
-676: Alliances cannot be made during Guild Wars!
-677: Alliances cannot be broken during Guild Wars!
-678: You are no longer the Guild Master.
-679: You have become the Guild Master!
-680: You have been recovered!
-//681-899 free
-
-681: Rune Knight T
-682: Warlock T
-683: Ranger T
-684: Arch Bishop T
-685: Mechanic T
-686: Guillotine Cross T
-687: Royal Guard T
-688: Sorcerer T
-689: Minstrel T
-690: Wanderer T
-691: Sura T
-692: Genetic T
-693: Shadow Chaser T
-
+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.
+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.
+867: You're not dead.
+868: Your current memo positions are:
+869: You broke the target's weapon.
+870: You can't leave battleground guilds.
+871: Friend already exists.
+872: Name not found in list.
+873: This action can't be performed at the moment. Please try again later.
+874: Friend removed.
+875: Cannot send mails too fast!!
+876: Alliances cannot be made during Guild Wars!
+877: Alliances cannot be broken during Guild Wars!
+878: You are no longer the Guild Master.
+879: You have become the Guild Master!
+880: You have been recovered!
+881: Shop is out of stock! Come again later!
+//882-899 FREE
 
 //------------------------------------
 // More atcommands message
@@ -660,9 +647,9 @@
 
 // @send
 900: Usage:
-901:	@send len <packet hex number>
-902: 	@send <packet hex number> {<value>}*
-903: 	Value: <type=B(default),W,L><number> or S<length>"<string>"
+901:   @send len <packet hex number>
+902:   @send <packet hex number> {<value>}*
+903:   Value: <type=B(default),W,L><number> or S<length>"<string>"
 904: Packet 0x%x length: %d
 905: Unknown packet: 0x%x
 906: Not a string:
@@ -700,10 +687,11 @@
 // @option
 921: Please enter at least one option.
 
+//922 FREE
+
 // @jobchange
-922: Please enter a job ID.
 923: You can not change to this job by command.
-//924-979 free (future jobs?)
+//924-979 FREE
 
 // @kami
 980: Please enter a message (usage: @kami <message>).
@@ -714,7 +702,7 @@
 983: Please enter an item name or ID (usage: @item <item name/ID> <quantity>).
 
 // @item2
-984: Please enter all parameters (usage: @item2 <item name/ID> <quantity>
+984: Please enter all parameters (usage: @item2 <item name/ID> <quantity>).
 985:   <identify_flag> <refine> <attribute> <card1> <card2> <card3> <card4>).
 
 // @baselevelup
@@ -740,8 +728,7 @@
 // @haircolor
 994: Please enter a hair color (usage: @haircolor/@hcolor <hair color: %d-%d>).
 
-// @go
-995: You cannot use @go on this map.
+//995 FREE
 
 // @refine
 996: Please enter a position and an amount (usage: @refine <equip position> <+/- amount>).
@@ -796,24 +783,24 @@
 // @recall
 1020: You are not authorized to warp this player from their map.
 
-// @charblock
-1021: Please enter a player name (usage: @charblock/@block <char name>).
+// @block
+1021: Please enter a player name (usage: @block <char name>).
 
-// @charban
-1022: Please enter ban time and a player name (usage: @charban/@ban/@banish/@charbanish <time> <char name>).
+// @ban
+1022: Please enter ban time and a player name (usage: @ban <time> <char name>).
 1023: You are not allowed to reduce the length of a ban.
 
-// @charunblock
-1024: Please enter a player name (usage: @charunblock <char name>).
+// @unblock
+1024: Please enter a player name (usage: @unblock <char name>).
 
-// @charunban
-1025: Please enter a player name (usage: @charunban <char name>).
+// @unban
+1025: Please enter a player name (usage: @unban <char name>).
 
 // @kick
 1026: Please enter a player name (usage: @kick <char name/ID>).
 
 // @questskill / @lostskill
-1027: Please enter a quest skill number.
+1027: Please enter a quest skill ID.
 
 // @spiritball
 1028: Please enter an amount (usage: @spiritball <number: 0-%d>).
@@ -828,7 +815,7 @@
 1031: Please enter part of an item name (usage: @idsearch <part_of_item_name>).
 
 // @recallall / @guildrecall / @partyrecall
-1032: You are not authorized to warp somenone to your current map.
+1032: You are not authorized to warp someone to your current map.
 1033: Because you are not authorized to warp from some maps, %d player(s) have not been recalled.
 
 // @guildrecall
@@ -867,7 +854,7 @@
 1060: NoWarp | 
 1061: NoWarpTo | 
 1062: NoReturn | 
-1063: NoGo | 
+//1063 FREE
 1064: NoMemo | 
 1065: No Exp Penalty: %s | No Zeny Penalty: %s
 1066: On
@@ -883,7 +870,7 @@
 1076: Clouds2 | 
 1077: Fireworks | 
 1078: Leaves | 
-//1079: Rain | 
+//1079 FREE
 1080: Displays Night | 
 1081: Other Flags: 
 1082: NoBranch | 
@@ -997,14 +984,14 @@
 1150: Please enter a message (usage: @localbroadcast <message>).
 
 // @email
-1151: Please enter 2 emails (usage: @email <actual@email> <new@email>).
+1151: Please enter two e-mail addresses (usage: @email <current@email> <new@email>).
 
 // @effect
 1152: Please enter an effect number (usage: @effect <effect number>).
 
 // @npcmove
 1153: Usage: @npcmove <X> <Y> <npc_name>
-1154: NPC is not on this map.
+1154: NPC is not in this map.
 1155: NPC moved.
 
 // @addwarp
@@ -1048,15 +1035,15 @@
 
 // @changelook
 1177: Usage: @changelook {<position>} <view id>
-1178: Position: 1-Top 2-Middle 3-Bottom 4-Weapon 5-Shield 6-Shoes 7-Robe
+1178: Position: 1:Top 2:Middle 3:Bottom 4:Weapon 5:Shield 6:Shoes 7:Robe
 
 // @autotrade
-1179: Autotrade is not allowed on this map.
+1179: Autotrade is not allowed in this map.
 1180: You cannot autotrade when dead.
 
 // @changegm
 1181: You need to be a Guild Master to use this command.
-1182: You cannot change guild leaders on this map.
+1182: You cannot change guild leaders in this map.
 1183: Usage: @changegm <guild_member_name>
 1184: Target character must be online and be a guild member.
 
@@ -1084,9 +1071,10 @@
 1199: Items on your autolootitem list:
 1200: Your autolootitem list has been reset.
 
-// @rain
-//1201: The rain has stopped.
-//1202: It has started to rain.
+// @guildstorage
+1201: Your guild's storage has already been opened by another member, try again later.
+
+//1202 FREE
 
 // @snow
 1203: Snow has stopped falling.
@@ -1097,20 +1085,20 @@
 1206: Cherry tree leaves have begun to fall.
 
 // @clouds
-1207: The clouds has disappear.
-1208: Clouds appear.
+1207: Clouds have disappeared.
+1208: Clouds appeared.
 
 // @clouds2
-1209: The alternative clouds disappear.
-1210: Alternative clouds appear.
+1209: Alternative clouds have disappeared.
+1210: Alternative clouds appeared.
 
 // @fog
 1211: The fog has gone.
 1212: Fog hangs over.
 
 // @leaves
-1213: Leaves no longer fall.
-1214: Fallen leaves fall.
+1213: Leaves have stopped falling.
+1214: Leaves started falling.
 
 // @fireworks
 1215: Fireworks have ended.
@@ -1141,7 +1129,7 @@
 1226: Usage: @adjgroup <group_id>
 1227: Specified group does not exist.
 1228: Group changed successfully.
-1229: Your group has changed.
+1229: Your group has been changed.
 
 // @trade
 1230: Please enter a player name (usage: @trade <char name>).
@@ -1194,7 +1182,7 @@
 1257: Invalid Homunculus ID.
 
 // @homfriendly
-1258: Please enter a friendly value (usage: @homfriendly <friendly value [0-1000]>).
+1258: Please enter an intimacy value (usage: @homfriendly <intimacy value [0-1000]>).
 
 // @homhungry
 1259: Please enter a hunger value (usage: @homhungry <hunger value [0-100]>).
@@ -1229,14 +1217,14 @@
 1278: None
 1279: With script
 1280: NPC Buy:%dz, Sell:%dz | Weight: %.1f 
-1281:  - Available in the shops only.
+1281:  - Available in shops only.
 1282:  - Maximal monsters drop chance: %02.02f%%
 1283:  - Monsters don't drop this item.
 
 // @whodrops
 1284: Please enter item name/ID (usage: @whodrops <item name/ID>).
 1285: Item: '%s'[%d]
-1286:  - Item is not dropped by mobs.
+1286:  - Item is not dropped by any mobs.
 1287:  - Common mobs with highest drop chance (only max %d are listed):
 
 // @whereis
@@ -1244,16 +1232,11 @@
 1289: %s spawns in:
 1290: This monster does not spawn normally.
 
-// @adopt
-1291: Usage: @adopt <father>,<mother>,<child>
-1292: Adopting: --%s--%s--%s--\n
-1293: Cannot find player %s online.
-1294: They are family... wish them luck.
+//1291-1294 FREE
 
 // @version
-1295: Git Hash '%s'
-1296: Cannot determine version.
-1436: SVN r%s
+1295: %s revision '%s' (src) / '%s' (scripts)
+1296: Hercules %d-bit for %s
 
 // @mutearea
 1297: Please enter a time in minutes (usage: @mutearea/@stfu <time in minutes>).
@@ -1291,7 +1274,7 @@
 1315: Available Flags:
 
 // @showexp
-1316: Gained exp will not be shown.  
+1316: Gained exp will not be shown.
 1317: Gained exp is now shown.
 
 // @showzeny
@@ -1423,12 +1406,13 @@
 1399: Unknown Channel (usage: %s <#channel_name>)
 1400: Unknown Channel '%s' (usage: %s <#channel_name>)
 1401: '%s' Channel is password protected (usage: %s <#channel_name> <password>)
+//1402 used by hercules chat feature
 1403: You're now in the '%s' channel
 
 // Hercules Chat Feature
 1402: You're not in that channel, type '@join <#channel_name>'
-1475: You're already in the '%s' channel
 1435: You're now in the '#%s' channel for '%s'
+1436: You're already in the '%s' channel
 
 // @channel
 1404: %s failed
@@ -1458,16 +1442,17 @@
 1428: - binds your global chat to <channel name>, making anything you type in global be sent to the channel
 1429: -- %s unbind
 1430: - unbinds your global chat from its attached channel (if binded)
-1431: Your global chat is now binded to the '%s' channel
-1432: Your global chat is not binded to any channel
-1433: Your global chat is now unbinded from the '#%s' channel
+1431: Your global chat is now bound to the '%s' channel
+1432: Your global chat is not bound to any channel
+1433: Your global chat is no longer bound to the '#%s' channel
 1434: Player '%s' was not found
-1437: Player '%s' has now been banned from '%s' channel
+//1435-1436 used by hercules chat feature
+1437: Player '%s' has now been banned from the '%s' channel
 1438: You cannot join the '%s' channel because you've been banned from it
 1439: Channel '%s' has no banned players
 1440: Player '%s' is not banned from this channel
 1441: Player '%s' has now been unbanned from the '%s' channel
-1442: Removed all bans from '%s' channel
+1442: Removed all bans from the '%s' channel
 1443: -- '%s' ban list
 1444: - %s
 1445: - %s (%d)
@@ -1489,7 +1474,7 @@
 1461: - unbans <character name> from <channel name> channel
 1462: -- %s setopt <channel name> <option name> <option value>
 1463: - adds or removes <option name> with <option value> to <channel name> channel
-1464: Ban failed, not possible to ban this user.
+1464: Ban failed, it is not possible to ban this user.
 1465: Player '%s' is already banned from this channel
 1466: For '%s' you need the amount of seconds (from 0 to 10)
 1467: -- %s unbanall <channel name>
@@ -1504,6 +1489,50 @@
 
 //src/map/pc.c::pc_isUseitem
 1474: You cannot use this item while sitting
+1475: You cannot use this item while your storage is open
+
+1476: You are already mounting something else
+
+//src/map/pc.c::pc_isUseitem
+1477: Item cannot be opened when inventory is full
+
+//@homlv
+1478: Homunculus reached its maximum level of '%d'
+
+//src/map/clif.c::clif_parse_GlobalMessage
+1479: Dear angel, can you hear my voice?
+1480: I am %s Super Novice~
+1481: Help me out~ Please~ T_T
+
+//Banking
+1482: You can't withdraw that much money
+1483: Banking is disabled
+
+//src/map/atcommand.c::ACMD(auction)
+1484: Auction is disabled
+
+//Monster Transformation
+1485: Traaaansformation-!! %s form!!
+1486: Cannot transform into monster while in disguise.
+1487: Character cannot be disguised while in monster form.
+1488: Transforming into monster is not allowed in Guild Wars.
+
+//CashShop mapflag
+1489: Cash Shop is disabled in this map
+
+// @autoloottype
+1490: You're already autolooting this item type.
+1491: Item type not found.
+1492: Autolooting item type: '%s'
+1493: You're currently not autolooting this item type.
+1494: Removed item type: '%s' from your autoloottype list.
+1495: Your autoloottype list is empty.
+1496: Item types on your autoloottype list:
+1497: Your autoloottype list has been reset.
+
+//Item Bind
+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!
 
 //Custom translations
 import: conf/import/msg_conf.txt
diff --git a/conf/plugins.conf b/conf/plugins.conf
index 264592fa9..8f171f034 100644
--- a/conf/plugins.conf
+++ b/conf/plugins.conf
@@ -14,7 +14,7 @@
 //== Description =====================================
 //The plugin system allows you to create customized scripts 
 //outside of the source. These scripts won't conflict with any 
-//future source updates - think about it as a /conf/import/ version of the source. 
+//future source updates - think of it as a /conf/import/ for the source. 
 //====================================================
 
 /* --------------- Format ---------------
@@ -23,16 +23,17 @@ you need to put in a comma, to separate the plugins.
 -----------------------------------------
 plugins_list: [
 	"example",
-	"other"
+	"other",
 ]
 -----------------------------------------
 Please note that your scripts need to be saved
 in the .c (source code) extension and placed in the /src/plugin/ folder.
 -----------------------------------------
 */
-
-plugins_list:[
+plugins_list: [
+	/* Enable HPMHooking when plugins in use rely on Hooking */
+	//"HPMHooking",
 	//"db2sql",
 	//"sample",
-	//"other"
+	//"other",
 ]
diff --git a/conf/readme.txt b/conf/readme.txt
index 24b113983..3323b5689 100644
--- a/conf/readme.txt
+++ b/conf/readme.txt
@@ -19,4 +19,4 @@ and you'll eliminate any problems updating in the future.
 
 Neat, isn't it?
 
-- Semi-guide by Ajarn / Euphy
\ No newline at end of file
+- Semi-guide by Ajarn / Euphy