Further work on MeleeFightState

Mostly complete, now working out bugs.  Unfortunately, the few I've
noticed so far are logic bugs.