Split move/combat. Make cleanup a loop.
Clean up logging for ambush. Convert ambush to modifier