mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-12 00:39:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Update wrap water generation to only consider longitude as there is no latitude wrap. (#8193)

Browse Source
This commit is contained in:
Philip Keiter
2022-12-21 03:13:59 -06:00
committed by GitHub
parent 68fc0487c1
commit 0b10bf1d14
1 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/src/com/unciv/logic/map/mapgenerator/MapLandmassGenerator.kt
View File

@ -279,51 +279,43 @@ class MapLandmassGenerator(val ruleset: Ruleset, val randomness: MapGenerationRa
longitudeFactor = max(0f, tileMap.maxLongitude - abs(tileInfo.longitude * sizeReductionFactor)) / tileMap.maxLongitude longitudeFactor = max(0f, tileMap.maxLongitude - abs(tileInfo.longitude * sizeReductionFactor)) / tileMap.maxLongitude
} }
var factor = min(longitudeFactor, latitudeFactor)
// If this is a world wrap, we want it to be separated on both sides - // If this is a world wrap, we want it to be separated on both sides -
// so we make the actual strip of water thinner, but we put it both in the middle of the map and on the edges of the map // so we make the actual strip of water thinner, but we put it both in the middle of the map and on the edges of the map
if (tileMap.mapParameters.worldWrap) { if (tileMap.mapParameters.worldWrap) {
longitudeFactor = min( factor = min(
longitudeFactor, factor,
(tileMap.maxLongitude - abs(tileInfo.longitude)) / tileMap.maxLongitude (tileMap.maxLongitude - abs(tileInfo.longitude)) / tileMap.maxLongitude
) * 1.5f ) * 1.5f
latitudeFactor = min(
latitudeFactor,
(tileMap.maxLatitude - abs(tileInfo.latitude)) / tileMap.maxLatitude
) * 1.5f
} }
// there's nothing magical about this, it's just what we got from playing around with a lot of different options - // there's nothing magical about this, it's just what we got from playing around with a lot of different options -
// the numbers can be changed if you find that something else creates better looking continents // the numbers can be changed if you find that something else creates better looking continents
return min(0.2, -1.0 + (5.0 * factor.pow(0.5f) + randomScale) / 3.0)
val landFactor = min(longitudeFactor, latitudeFactor)
return min(0.2, -1.0 + (5.0 * landFactor.pow(0.5f) + randomScale) / 3.0)
} }
private fun getFourCornersTransform(tileInfo: TileInfo, tileMap: TileMap): Double { private fun getFourCornersTransform(tileInfo: TileInfo, tileMap: TileMap): Double {
// The idea here is to create a water area separating the four land areas. // The idea here is to create a water area separating the four land areas.
// So what we do it create a line of water in the middle - where latitude or longitude is close to 0. // So what we do it create a line of water in the middle - where latitude or longitude is close to 0.
val randomScale = randomness.RNG.nextDouble() val randomScale = randomness.RNG.nextDouble()
var longitudeFactor = abs(tileInfo.longitude) / tileMap.maxLongitude val longitudeFactor = abs(tileInfo.longitude) / tileMap.maxLongitude
var latitudeFactor = abs(tileInfo.latitude) / tileMap.maxLatitude val latitudeFactor = abs(tileInfo.latitude) / tileMap.maxLatitude
var factor = min(longitudeFactor, latitudeFactor)
// If this is a world wrap, we want it to be separated on both sides - // If this is a world wrap, we want it to be separated on both sides -
// so we make the actual strip of water thinner, but we put it both in the middle of the map and on the edges of the map // so we make the actual strip of water thinner, but we put it both in the middle of the map and on the edges of the map
if (tileMap.mapParameters.worldWrap) { if (tileMap.mapParameters.worldWrap) {
longitudeFactor = min( factor = min(
longitudeFactor, factor,
(tileMap.maxLongitude - abs(tileInfo.longitude)) / tileMap.maxLongitude (tileMap.maxLongitude - abs(tileInfo.longitude)) / tileMap.maxLongitude
) * 1.5f ) * 1.5f
latitudeFactor = min(
latitudeFactor,
(tileMap.maxLatitude - abs(tileInfo.latitude)) / tileMap.maxLatitude
) * 1.5f
} }
// there's nothing magical about this, it's just what we got from playing around with a lot of different options - // there's nothing magical about this, it's just what we got from playing around with a lot of different options -
// the numbers can be changed if you find that something else creates better looking continents // the numbers can be changed if you find that something else creates better looking continents
return min(0.2, -1.0 + (5.0 * factor.pow(0.5f) + randomScale) / 3.0)
val landFactor = min(longitudeFactor, latitudeFactor)
return min(0.2, -1.0 + (5.0 * landFactor.pow(0.5f) + randomScale) / 3.0)
} }
/** /**