Added HP bars to combat screen, fixed combat end detection.