fixed the drawing of city and moved it to settler
added a little to combat