Further bugfixing in combat. Combat is now fully functioning, except for
transition back to grid after end