It's simple enough to insert tundra and tundra hills into ValidTerrains. However, is there anyway to set the requirement for rivers if it's tundra? I know there is a RequiresRivers tag but that won't apply only to tundra, it would be a general requirement for farms.