generate hills and mountains map type and reorganize some stuff