Modified Discrete Map Calculation With Water

Changed so instead of only using water discrete map when there is water,
it just ignores altitude differences if there is water so that other
layers will still be considered if there is water.