summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorAnnieRuru <jeankof@ymail.com>2015-11-20 18:53:14 +0800
committerHaru <haru@dotalux.com>2015-12-25 21:17:38 +0100
commit83301cc59a75f14bea4b73136e7dffc396f37fc3 (patch)
tree99c72365f57942ce2f00a57b534b216f5ad4a000 /src/map/battle.c
parent75141a35e907f76ce7626f0f7cb421ec3217bcc1 (diff)
downloadhercules-83301cc59a75f14bea4b73136e7dffc396f37fc3.tar.gz
hercules-83301cc59a75f14bea4b73136e7dffc396f37fc3.tar.bz2
hercules-83301cc59a75f14bea4b73136e7dffc396f37fc3.tar.xz
hercules-83301cc59a75f14bea4b73136e7dffc396f37fc3.zip
*Show the katar critical bonus in player status window
- this is unofficial behavior, so it has to be in battle config Related to #579 Closes #882 as merged Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 1c3817a31..a040d443b 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -4558,8 +4558,8 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
{
short cri = sstatus->cri;
if (sd) {
- // Check for katar here as katar crit bonus should not be displayed
- if (sd->status.weapon == W_KATAR) {
+ // if show_katar_crit_bonus is enabled, it already done the calculation in status.c
+ if (!battle_config.show_katar_crit_bonus && sd->status.weapon == W_KATAR) {
cri <<= 1;
}
@@ -7078,6 +7078,7 @@ static const struct battle_data {
{ "mob_remove_damaged", &battle_config.mob_remove_damaged, 1, 0, 1, },
{ "show_hp_sp_drain", &battle_config.show_hp_sp_drain, 0, 0, 1, },
{ "show_hp_sp_gain", &battle_config.show_hp_sp_gain, 1, 0, 1, },
+ { "show_katar_crit_bonus", &battle_config.show_katar_crit_bonus, 0, 0, 1, },
{ "mob_npc_event_type", &battle_config.mob_npc_event_type, 1, 0, 1, },
{ "character_size", &battle_config.character_size, 1|2, 0, 1|2, },
{ "retaliate_to_master", &battle_config.retaliate_to_master, 1, 0, 1, },