Changed World Map code

Changed the World Map code to follow better coding procedures. Also, the
field for each farm now chooses water plots randomly.