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

Better Pangaea generation, no Default map

Browse Source
This commit is contained in:
Yair Morgenstern
2023-01-19 18:17:46 +02:00
parent e57831ff0b
commit 4a3ef08324
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/MainMenuScreen.kt
View File

@ -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()
})

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

@ -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)
}

1
core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt
View File

@ -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,