Fixes bleed being applied when damage has been mitigated. Had been using...

[frycarson]

... damage before armor or block had been taken into account. Issue #6432

[KA101]

Two issues here.

1. It's possible, though not certain, that the head's supposed to take double damage. That's not unknown in location-based HP. Worth discussing that, IMO.

2. the if-statement there is so you don't take overkill damage on a fatal hit. hp_head <= 0 => Game Over, press spacebar. The game looks out for that enough to make me think it's worth keeping around.

[frycarson]

I'll revert that bit of the change for now then until we determine whether double damage is intended or not. The if statement is in the other spot in the code where the damage is initially applied, and if double damage is the intent I think that should be moved to where the rest of the damage is applied to make the intent clear (player::apply_damage() as opposed to player::deal_damage()). I could probably also eliminate many of the other comments.

[KA101]

OK, pending a resolution to the head-damage question, then.

[Waladil]

I'd really like this to get put into master -- I'd say leave the 2x head damage thing and maybe open a different PR to either remove it or change how that works so it (among other things) shows correct damage in the game log.

[KA101]

Concur.

[frycarson]

Did you strip the commenting to readd the 2x head damage, or do I need
to do that?

On 3/6/14, KA101 notifications@github.com wrote:

Merged #6460.

---

Reply to this email directly or view it on GitHub:
#6460

[KA101]

I've had to clean up enough PRs recently that right now I don't really remember. Go ahead and PR it just in case.