From b40edb7ea1dad904ffc09d20d4f8be887698dff5 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 21 Dec 2015 21:22:05 +0300
Subject: Update conf from hercules.

---
 conf/battle/guild.conf   |  5 +++--
 conf/battle/misc.conf    | 16 ++++++++++------
 conf/battle/monster.conf |  4 ++++
 conf/battle/party.conf   |  3 +--
 conf/battle/player.conf  |  1 +
 conf/battlegrounds.conf  | 14 +++++++-------
 conf/char-server.conf    |  2 +-
 conf/inter-server.conf   | 30 ++----------------------------
 conf/login-server.conf   |  8 ++++----
 conf/messages.conf       |  4 +++-
 conf/packet.conf         |  9 +++++----
 conf/script.conf         |  1 -
 12 files changed, 41 insertions(+), 56 deletions(-)

diff --git a/conf/battle/guild.conf b/conf/battle/guild.conf
index 91c39fe7..59fc78c5 100644
--- a/conf/battle/guild.conf
+++ b/conf/battle/guild.conf
@@ -17,7 +17,8 @@ guild_exp_limit: 50
 guild_max_castles: 0
 
 // Restart guild skills cooldown by relog? (Note 1)
-// When "no", you relog with the same cooldown remaining as from when you logged out, "yes" restarts the cooldown upon login to its full duration. 
+// 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)
@@ -46,4 +47,4 @@ 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
+guild_castle_expulsion: no
diff --git a/conf/battle/misc.conf b/conf/battle/misc.conf
index 09600aa2..535f3a13 100644
--- a/conf/battle/misc.conf
+++ b/conf/battle/misc.conf
@@ -9,12 +9,16 @@
 //         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 //--------------------------------------------------------------
 
-// PK Server Mode.  Turns entire server pvp(excluding towns). Experience loss is doubled if killed by another player.
-// When players hunt monsters over 20 levels higher, they will receive 15% additional exp., and 25% chance of receiving more items. 
-// There is a nopvp.txt for setting up maps not to have pk on in this mode.  Novices cannot be attacked and cannot attack.
-// Normal pvp counter and rank display are disabled as well.
-// Note: If pk_mode is set to 2 instead of 1 (yes), players will receive a 
-//   manner penalty of 5 each time they kill another player (see manner_system 
+// PK Server Mode.
+//   Turns entire server pvp(excluding towns).
+//   Experience loss is doubled if killed by another player.
+//   When players hunt monsters over 20 levels higher, they will receive 15%
+//   additional exp., and 25% chance of receiving more items.
+//   There is a nopvp.txt for setting up maps not to have pk on in this mode.
+//   Novices cannot be attacked and cannot attack.
+//   Normal pvp counter and rank display are disabled as well.
+// Note: If pk_mode is set to 2 instead of 1 (yes), players will receive a
+//   manner penalty of 5 each time they kill another player (see manner_system
 //   config to adjust how this will affect players)
 pk_mode: 0
 
diff --git a/conf/battle/monster.conf b/conf/battle/monster.conf
index fcf30037..b2394bde 100644
--- a/conf/battle/monster.conf
+++ b/conf/battle/monster.conf
@@ -211,6 +211,10 @@ mob_slave_keep_target: yes
 // See http://irowiki.org/wiki/MVP#Gravestone
 mvp_tomb_enabled: yes
 
+// Show hp bar on monsters? (Default: yes)
+// NOTE: only works on client 2012-04-04aRagexeRE onwards
+show_monster_hp_bar: yes
+
 // Whether or not the size of specially summoned mobs influences experience, drop rates,
 // and stats. The rates will be doubled for large mobs, and halved for small ones.
 // This is only invoked under the 'monster' command, @monsterbig, and @monstersmall. (Note 1)
diff --git a/conf/battle/party.conf b/conf/battle/party.conf
index 14d5f47c..72a22b94 100644
--- a/conf/battle/party.conf
+++ b/conf/battle/party.conf
@@ -18,7 +18,7 @@ party_update_interval: 1000
 // 1: Athena - bar is updated with the party map dots (up to 1 second delay)
 party_hp_mode: 0
 
-// When 'Party Share' item sharing is enabled in a party, 
+// When 'Party Share' item sharing is enabled in a party,
 // announce in the party which party-member received the item and what's he received? (Note 1)
 show_party_share_picker: yes
 
@@ -30,7 +30,6 @@ show_party_share_picker: yes
 show_picker.item_type: 112
 
 // Method of distribution when item party share is enabled in a party:
-// 
 // 0: Normal (item goes to a random party member)
 // 1: Item Share is disabled for non-mob drops (player/pet drops)
 // 2: Round Robin (items are distributed evenly and in order among members)
diff --git a/conf/battle/player.conf b/conf/battle/player.conf
index 0b39b757..e544ee84 100644
--- a/conf/battle/player.conf
+++ b/conf/battle/player.conf
@@ -51,6 +51,7 @@ basic_skill_check: yes
 // Value is also affected by 'invincible_time_inc' mapflag
 player_invincible_time: 5000
 
+// When set to true, it prevent portal abuse for avoid hits. Official value is false.
 fix_warp_hit_delay_abuse: 1
 
 // The time interval for HP to restore naturally. (in milliseconds)
diff --git a/conf/battlegrounds.conf b/conf/battlegrounds.conf
index ea54d3f2..2b4184e1 100644
--- a/conf/battlegrounds.conf
+++ b/conf/battlegrounds.conf
@@ -1,12 +1,12 @@
 //====================================================
-//=       _   _                     _           
-//=      | | | |                   | |          
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___ 
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
 //=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//=                                                  
-//=            http://herc.ws/board/                        
+//=
+//=            http://herc.ws/board/
 //====================================================
 //= http://herc.ws/board/topic/928-memory-slasher-may-30-patch/
 //====================================================
@@ -21,12 +21,12 @@
 battlegrounds: (
 {
 	/* feature is not complete */
-	feature_off:true
+	feature_off: true
 	/* character variable for global bg delay */
 	global_delay_var: "BG_Delay_Tick"
 	/* how many seconds to consider a player "afk" and kick him out? */
 	maximum_afk_seconds: 30
-		
+
 	/* one can add as many as he wishes */
 	/* for custom ones, need to edit "lua files/entryqueue/entryqueuelist.lua" [Ind/Hercules] */
 	arenas: ({
diff --git a/conf/char-server.conf b/conf/char-server.conf
index eac30cc2..056d15af 100644
--- a/conf/char-server.conf
+++ b/conf/char-server.conf
@@ -95,7 +95,7 @@ autosave_time: 60
 save_log: yes
 
 // Start point, Map name followed by coordinates (x,y)
-start_point: 000-0,22,24
+start_point_re: 000-0,22,24
 
 // Starting items for new characters
 // Format is: id1,quantity1,stackable1,idN,quantityN,stackableN
diff --git a/conf/inter-server.conf b/conf/inter-server.conf
index 2bffeb1a..704d5fc1 100644
--- a/conf/inter-server.conf
+++ b/conf/inter-server.conf
@@ -15,10 +15,10 @@ party_share_level: 15
 
 // You can specify the codepage to use in your mySQL tables here.
 // (Note that this feature requires MySQL 4.1+)
-//default_codepage: 
+//default_codepage:
 
 
-// For IPs, ideally under linux, you want to use localhost instead of 127.0.0.1 
+// For IPs, ideally under linux, you want to use localhost instead of 127.0.0.1
 // Under windows, you want to use 127.0.0.1.  If you see a message like
 // "Can't connect to local MySQL server through socket '/tmp/mysql.sock' (2)"
 // and you have localhost, switch it to 127.0.0.1
@@ -117,35 +117,9 @@ char_reg_str_db: char_reg_str_db
 char_reg_num_db: char_reg_num_db
 
 // Map Database Tables
-item_db_db: item_db
-item_db2_db: item_db2
-mob_db_db: mob_db
-mob_db2_db: mob_db2
-mob_skill_db_db: mob_skill_db
-mob_skill_db2_db: mob_skill_db2
 mapreg_db: mapreg
 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 9e0bc500..406b495b 100644
--- a/conf/login-server.conf
+++ b/conf/login-server.conf
@@ -9,7 +9,7 @@
 // NOTE: This allows you to run multiple servers on multiple interfaces
 // while using the same ports for each server.
 //bind_ip: 127.0.0.1
- 
+
 // Login Server Port
 login_port: 6900
 
@@ -87,7 +87,7 @@ ipban.enable: yes
 //ipban.sql.db_username: ragnarok
 //ipban.sql.db_password: ragnarok
 //ipban.sql.db_database: ragnarok
-//ipban.sql.codepage: 
+//ipban.sql.codepage:
 //ipban.sql.ipban_table: ipbanlist
 // Dynamic password failure ipban system
 ipban.dynamic_pass_failure_ban: yes
@@ -105,7 +105,7 @@ ipban_cleanup_interval: 60
 //ip_sync_interval: 10
 
 // DNS Blacklist Blocking
-// If enabled, each incoming connection will be tested against the blacklists 
+// If enabled, each incoming connection will be tested against the blacklists
 // on the specified dnsbl_servers (comma-separated list)
 use_dnsbl: no
 dnsbl_servers: bl.blocklist.de, socks.dnsbl.sorbs.net
@@ -128,7 +128,7 @@ dnsbl_servers: bl.blocklist.de, socks.dnsbl.sorbs.net
 //account.sql.db_username: ragnarok
 //account.sql.db_password: ragnarok
 //account.sql.db_database: ragnarok
-//account.sql.codepage: 
+//account.sql.codepage:
 //account.sql.case_sensitive: no
 //account.sql.account_db: login
 //account.sql.accreg_db: global_reg_value
diff --git a/conf/messages.conf b/conf/messages.conf
index c5344d26..a2716c7c 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -1235,7 +1235,8 @@
 // @mobinfo ...
 1291:  ATK:%d~%d MATK:%d~%d Range:%d~%d~%d  Size:%s  Race: %s  Element: %s (Lv:%d)
 
-//1292-1294 FREE
+//1292-1293 FREE
+//1294 used by hercules chat feature
 
 // @version
 1295: %s revision '%s' (src) / '%s' (scripts)
@@ -1416,6 +1417,7 @@
 1402: You're not in that channel, type '@join <#channel_name>'
 1435: You're now in the '#%s' channel for '%s'
 1436: You're already in the '%s' channel
+1294: You're not allowed to talk on this channel
 
 // @channel
 1404: %s failed
diff --git a/conf/packet.conf b/conf/packet.conf
index 85996f4e..3a7ec2c8 100644
--- a/conf/packet.conf
+++ b/conf/packet.conf
@@ -10,12 +10,15 @@ debug: no
 // How long can a socket stall before closing the connection (in seconds)?
 stall_time: 60
 
-// Maximum allowed size for clients packets in bytes (default: 24576).
+// Maximum allowed size for clients packets in bytes (default: 65535).
+// Default Values:
+// 24576 (Clients < 20131223)
+// 65535 (Clients >= 20131223)
 // NOTE: To reduce the size of reported packets, lower the values of defines, which
 //       have been customized, such as MAX_STORAGE, MAX_GUILD_STORAGE or MAX_CART.
 // NOTE: Do not modify this setting, unless the client has been modified to support
 //       larger packets. The client will crash, when it receives larger packets.
-socket_max_client_packet: 24576
+//socket_max_client_packet: 65535
 
 //----- IP Rules Settings -----
 
@@ -45,7 +48,6 @@ order: deny,allow
 
 // deny: 127.0.0.1
 
-
 //---- DDoS Protection Settings ----
 // If ddos_count connection request are made within ddos_interval msec, it assumes it's a DDoS attack
 
@@ -62,5 +64,4 @@ ddos_count: 5
 // (default is 600000 msecs, 10 minutes)
 ddos_autoreset: 600000
 
-
 import: conf/import/packet_conf.txt
diff --git a/conf/script.conf b/conf/script.conf
index 57442e87..1512aa15 100644
--- a/conf/script.conf
+++ b/conf/script.conf
@@ -2,7 +2,6 @@
 // Hercules Script Configuration File
 //--------------------------------------------------------
 
-
 warn_func_mismatch_paramnum: yes
 
 check_cmdcount: 655360
-- 
cgit v1.2.3-70-g09d2