AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolves #12022 kudos @SomeTroglodyte

Browse Source
This commit is contained in:
Yair Morgenstern 2024-07-30 23:41:23 +03:00
parent 4524d439e2
commit fa2c389ae2
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt
View File

@ -417,7 +417,7 @@ class MapGenerator(val ruleset: Ruleset, private val coroutineScope: CoroutineSc
val humidityRandom = randomness.getPerlinNoise(tile, humiditySeed, scale = scale, nOctaves = 1)
val humidity = ((humidityRandom + 1.0) / 2.0 + humidityShift).coerceIn(0.0..1.0)
val expectedTemperature = if (tileMap.mapParameters.shape === MapShape.flatEarth) {
val expectedTemperature = if (tileMap.mapParameters.shape == MapShape.flatEarth) {
// Flat Earth uses radius because North is center of map
val radius = getTileRadius(tile, tileMap)
val radiusTemperature = getTemperatureAtRadius(radius)
@ -589,7 +589,7 @@ class MapGenerator(val ruleset: Ruleset, private val coroutineScope: CoroutineSc
0f, 1f))
}.toList()
if (tileMap.mapParameters.shape === MapShape.flatEarth) {
if (tileMap.mapParameters.shape == MapShape.flatEarth) {
spawnFlatEarthIceWalls(tileMap, iceEquivalents)
}

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

@ -61,7 +61,7 @@ class MapLandmassGenerator(
MapType.smallContinents -> createSmallContinents()
}
if (tileMap.mapParameters.shape === MapShape.flatEarth) {
if (tileMap.mapParameters.shape == MapShape.flatEarth) {
generateFlatEarthExtraWater()
}
}
@ -130,7 +130,7 @@ class MapLandmassGenerator(
for (tile in tileMap.values) {
val maxdim = max(tileMap.maxLatitude, tileMap.maxLongitude)
var ratio = maxdim / 32.0 // change scale depending on map size so that average number of continents stay the same
if (tileMap.mapParameters.shape === MapShape.hexagonal || tileMap.mapParameters.shape === MapShape.flatEarth) {
if (tileMap.mapParameters.shape == MapShape.hexagonal || tileMap.mapParameters.shape == MapShape.flatEarth) {
ratio *= 0.5 // In hexagonal type map for some reason it tends to make a single continent like pangaea if we don't diminish the scale
}
@ -205,7 +205,7 @@ class MapLandmassGenerator(
private fun createContinentAndIslands() {
val isNorth = randomness.RNG.nextDouble() < 0.5
val isLatitude =
if (tileMap.mapParameters.shape === MapShape.hexagonal || tileMap.mapParameters.shape === MapShape.flatEarth) randomness.RNG.nextDouble() > 0.5f
if (tileMap.mapParameters.shape == MapShape.hexagonal || tileMap.mapParameters.shape == MapShape.flatEarth) randomness.RNG.nextDouble() > 0.5f
else if (tileMap.mapParameters.mapSize.height > tileMap.mapParameters.mapSize.width) true
else if (tileMap.mapParameters.mapSize.width > tileMap.mapParameters.mapSize.height) false
else randomness.RNG.nextDouble() > 0.5f
@ -220,7 +220,7 @@ class MapLandmassGenerator(
private fun createTwoContinents() {
val isLatitude =
if (tileMap.mapParameters.shape === MapShape.hexagonal || tileMap.mapParameters.shape === MapShape.flatEarth) randomness.RNG.nextDouble() > 0.5f
if (tileMap.mapParameters.shape == MapShape.hexagonal || tileMap.mapParameters.shape == MapShape.flatEarth) randomness.RNG.nextDouble() > 0.5f
else if (tileMap.mapParameters.mapSize.height > tileMap.mapParameters.mapSize.width) true
else if (tileMap.mapParameters.mapSize.width > tileMap.mapParameters.mapSize.height) false
else randomness.RNG.nextDouble() > 0.5f
@ -236,7 +236,7 @@ class MapLandmassGenerator(
private fun createThreeContinents() {
val isNorth = randomness.RNG.nextDouble() < 0.5
// On flat earth maps we can randomly do East or West instead of North or South
val isEastWest = tileMap.mapParameters.shape === MapShape.flatEarth && randomness.RNG.nextDouble() > 0.5
val isEastWest = tileMap.mapParameters.shape == MapShape.flatEarth && randomness.RNG.nextDouble() > 0.5
val elevationSeed = randomness.RNG.nextInt().toDouble()
for (tile in tileMap.values) {
@ -334,7 +334,7 @@ class MapLandmassGenerator(
var latitudeFactor = abs(tile.latitude) / tileMap.maxLatitude
// 3rd continent should use only half the map width, or if flat earth, only a third
val sizeReductionFactor = if (tileMap.mapParameters.shape === MapShape.flatEarth) 3f else 2f
val sizeReductionFactor = if (tileMap.mapParameters.shape == MapShape.flatEarth) 3f else 2f
// We then pick one side to be merged into one centered continent instead of two cornered.
if (isEastWest) {
@ -398,7 +398,7 @@ class MapLandmassGenerator(
val xdistanceratio = abs(x) / maxX
val ydistanceratio = abs(y) / maxY
if (tileMap.mapParameters.shape === MapShape.hexagonal || tileMap.mapParameters.shape === MapShape.flatEarth) {
if (tileMap.mapParameters.shape == MapShape.hexagonal || tileMap.mapParameters.shape == MapShape.flatEarth) {
val startdropoffratio = 0.8 // distance from center at which we start decreasing elevation linearly
val xdrsquared = xdistanceratio * xdistanceratio
val ydrsquared = ydistanceratio * ydistanceratio