I partly rewrote the faction mechanics. The faction turn now takes places across the entire city instead of just one district at a time. To do this, I simplified all setup actions as well as setting up and updating district baselines. 

I also reworked the defences chapter and added a method to randomly generate the shapes of districts on the city map.