diff options
| author | Haru <haru@dotalux.com> | 2018-11-14 19:35:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-14 19:35:02 +0100 |
| commit | 9f77ce4b9702b1efe079ef9b1abe491482690850 (patch) | |
| tree | 0a5191147d24ca56b60ca01dac71801974a1a8ce /src/map/battle.c | |
| parent | 1c315c13f048dc44c5b002ca39095b18d212b9c5 (diff) | |
| parent | 8269fdcd5d036ddc3c24bc0ebb4ad958b5c19a3a (diff) | |
| download | hercules-9f77ce4b9702b1efe079ef9b1abe491482690850.tar.gz hercules-9f77ce4b9702b1efe079ef9b1abe491482690850.tar.bz2 hercules-9f77ce4b9702b1efe079ef9b1abe491482690850.tar.xz hercules-9f77ce4b9702b1efe079ef9b1abe491482690850.zip | |
Merge pull request #1215 from HerculesWS/HP_Display
Fixes #889 & #840
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 44241bf23..652453bf0 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2872,7 +2872,7 @@ static int64 battle_calc_damage(struct block_list *src, struct block_list *bl, s if( sc->data[SC__MAELSTROM] && (flag&BF_MAGIC) && skill_id && (skill->get_inf(skill_id)&INF_GROUND_SKILL) ) { // {(Maelstrom Skill LevelxAbsorbed Skill Level)+(Caster's Job/5)}/2 int sp = (sc->data[SC__MAELSTROM]->val1 * skill_lv + (t_sd ? t_sd->status.job_level / 5 : 0)) / 2; - status->heal(bl, 0, sp, 3); + status->heal(bl, 0, sp, STATUS_HEAL_FORCED | STATUS_HEAL_SHOWEFFECT); d->dmg_lv = ATK_BLOCK; return 0; } @@ -3243,7 +3243,7 @@ static int64 battle_calc_damage(struct block_list *src, struct block_list *bl, s //(since battle_drain is strictly for players currently) if ((sce=sc->data[SC_HAMI_BLOODLUST]) && flag&BF_WEAPON && damage > 0 && rnd()%100 < sce->val3) - status->heal(src, damage*sce->val4/100, 0, 3); + status->heal(src, damage*sce->val4/100, 0, STATUS_HEAL_FORCED | STATUS_HEAL_SHOWEFFECT); if( (sce = sc->data[SC_FORCEOFVANGUARD]) && flag&BF_WEAPON && rnd()%100 < sce->val2 && sc->fv_counter <= sce->val3 ) @@ -6094,7 +6094,7 @@ static void battle_drain(struct map_session_data *sd, struct block_list *tbl, in if (!thp && !tsp) return; - status->heal(&sd->bl, thp, tsp, battle_config.show_hp_sp_drain ? 3 : 1); + status->heal(&sd->bl, thp, tsp, STATUS_HEAL_FORCED | (battle_config.show_hp_sp_drain ? STATUS_HEAL_SHOWEFFECT : STATUS_HEAL_DEFAULT)); if (rhp || rsp) status_zap(tbl, rhp, rsp); @@ -7407,6 +7407,7 @@ static const struct battle_data { { "features/feature_attendance_endtime",&battle_config.feature_attendance_endtime, 1, 0, 99999999, }, { "min_item_buy_price", &battle_config.min_item_buy_price, 1, 0, INT_MAX, }, { "min_item_sell_price", &battle_config.min_item_sell_price, 0, 0, INT_MAX, }, + { "display_fake_hp_when_dead", &battle_config.display_fake_hp_when_dead, 1, 0, 1, }, }; static bool battle_set_value_sub(int index, int value) |