Minor Combat Updates

I made some minor updates to how harm is dealt with for threats. Threats now have conditions that get marked after the threat receives three harm. This should make combat run smoother since threats will be similar to Protagonists.