diff --git a/core/src/com/unciv/MainMenuScreen.kt b/core/src/com/unciv/MainMenuScreen.kt index 8101b7069e..a7c7a83b34 100644 --- a/core/src/com/unciv/MainMenuScreen.kt +++ b/core/src/com/unciv/MainMenuScreen.kt @@ -123,7 +123,7 @@ class MainMenuScreen: BaseScreen(), RecreateOnResize { .generateMap(MapParameters().apply { shape = MapShape.rectangular mapSize = MapSizeNew(mapWidth.toInt() + 1, mapHeight.toInt() + 1) - type = MapType.default + type = MapType.pangaea waterThreshold = -0.1f // mainly land, gets about 30% water modifyForEasterEgg() }) diff --git a/core/src/com/unciv/logic/map/mapgenerator/MapLandmassGenerator.kt b/core/src/com/unciv/logic/map/mapgenerator/MapLandmassGenerator.kt index c0266376ea..6f72b90e16 100644 --- a/core/src/com/unciv/logic/map/mapgenerator/MapLandmassGenerator.kt +++ b/core/src/com/unciv/logic/map/mapgenerator/MapLandmassGenerator.kt @@ -1,7 +1,11 @@ package com.unciv.logic.map.mapgenerator import com.unciv.logic.map.HexMath -import com.unciv.logic.map.* +import com.unciv.logic.map.MapShape +import com.unciv.logic.map.MapType +import com.unciv.logic.map.Perlin +import com.unciv.logic.map.TileInfo +import com.unciv.logic.map.TileMap import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.tile.TerrainType import kotlin.math.abs @@ -123,8 +127,8 @@ class MapLandmassGenerator(val ruleset: Ruleset, val randomness: MapGenerationRa private fun createPangaea(tileMap: TileMap) { val elevationSeed = randomness.RNG.nextInt().toDouble() for (tile in tileMap.values) { - var elevation = randomness.getPerlinNoise(tile, elevationSeed) - elevation = (elevation + getEllipticContinent(tile, tileMap)) / 2.0 + var elevation = randomness.getPerlinNoise(tile, elevationSeed, scale=30.0) + elevation = elevation*(3/4f) + getEllipticContinent(tile, tileMap) / 4 spawnLandOrWater(tile, elevation) } } @@ -204,7 +208,7 @@ class MapLandmassGenerator(val ruleset: Ruleset, val randomness: MapGenerationRa val x = tileInfo.longitude val y = tileInfo.latitude - val distanceFactor = x * x / (a * a) + y * y / (b * b) + val distanceFactor = x * x / (a * a) + y * y / (b * b) + (x+y).pow(2) / (a+b).pow(2) return min(0.3, 1.0 - (5.0 * distanceFactor * distanceFactor + randomScale) / 3.0) } diff --git a/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt b/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt index 74ea489ca0..dc780a11aa 100644 --- a/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt +++ b/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt @@ -118,7 +118,6 @@ class MapParametersTable( private fun addMapTypeSelectBox() { // MapType is not an enum so we can't simply enumerate. //todo: make it so! val mapTypes = listOfNotNull( - MapType.default, MapType.pangaea, MapType.continentAndIslands, MapType.twoContinents,