update for hercules v2020.06.28

12 files changed, 164 insertions, 47 deletions

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"