Tweaked combat system, relocated HP bar rendering.

Bugs still exist with NPC deaths and the Melee AI combat AI is still quite buggy.