Work on fixing up combat and just death in general.

It still needs a lot of work, but this is closer to what we need.
The big issue here is death needs a new state instead of just checking
for hp < 0.  This is much better than it was though so commiting.