Nigel Gay

Add the special bonus production that you get on the main city tile

Allocate player colours; write city names and pop sizes on the overland map

Don't place cities on ruins

Rename maximumWorkers to workersRequiredToFullyFarmThisRadius... phrasing it as a minimum pop required to fully farm that radius makes MUCH more sense than phrasing it as a maximum.

Draw cities on the map

Strip out all the old CTP1-specific and CTP2-specific stuff that I replaced by cityImageRule

Write all cityImageRules by hand as its too awkward to convert the existing data from the totally different formats used by CTP1 and CTP2

Change the CTP2 city styles into meaningful IDs, copy them to CTP1, and make civs defining their city style a foreign key