Added logic to prevent switching states from not doing anything for a turn.

Also better encampment stuff