Update display after fight over
Tweak combat conditions
First commit of adventure stuff
Show settlements tab at appropriate time