Combat system unification & kill streak fixes

Kill streaks were resetting inconsistently. Dying in a boss fight or the Conduit didn't always reset your streak, and sometimes boss kills would cause your streak to expire moments later even though you were actively fighting. Both are fixed — streaks now behave predictably across all fight types.

Fixed a display bug where regular monster encounters showed "Boss fight in progress…" instead of the correct label.