Redefined city working tiles algorithm + first attempt at combat