Fix the refactoring leftover.
Insert waits around a click.
Hopefully this reduces the chance of a failure to click.
Better handle the night battle in practice.
Better handle the wait in expedition.
Factor out the threshold for warming up.