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

Two Continents Allow both Lat or Long (#8110)

Browse Source 
* Rename generated map "Continents" to "Two Continents" and make it randomly choose latitude or longitude land division.

* Choose latitude or longitude land division based on map width and height if they are not equal.
This commit is contained in:
Philip Keiter 2022-12-13 14:52:51 -06:00 committed by GitHub
parent eebad0238b
commit 2145bc80b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/map/MapParameters.kt
View File

@ -130,7 +130,7 @@ object MapShape : IsPartOfGameInfoSerialization {
object MapType : IsPartOfGameInfoSerialization {
const val default = "Default"
const val pangaea = "Pangaea"
const val continents = "Continents"
const val twoContinents = "Two Continents"
const val fourCorners = "Four Corners"
const val archipelago = "Archipelago"
const val innerSea = "Inner Sea"

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

@ -40,7 +40,7 @@ class MapLandmassGenerator(val ruleset: Ruleset, val randomness: MapGenerationRa
when (tileMap.mapParameters.type) {
MapType.pangaea -> createPangaea(tileMap)
MapType.innerSea -> createInnerSea(tileMap)
MapType.continents -> createTwoContinents(tileMap)
MapType.twoContinents -> createTwoContinents(tileMap)
MapType.fourCorners -> createFourCorners(tileMap)
MapType.smoothedRandom -> generateLandCellularAutomata(tileMap)
MapType.archipelago -> createArchipelago(tileMap)
@ -106,10 +106,16 @@ class MapLandmassGenerator(val ruleset: Ruleset, val randomness: MapGenerationRa
}
private fun createTwoContinents(tileMap: TileMap) {
val isLatitude =
if (tileMap.mapParameters.shape === MapShape.hexagonal) 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
val elevationSeed = randomness.RNG.nextInt().toDouble()
for (tile in tileMap.values) {
var elevation = randomness.getPerlinNoise(tile, elevationSeed)
elevation = (elevation + getTwoContinentsTransform(tile, tileMap)) / 2.0
elevation = (elevation + getTwoContinentsTransform(tile, tileMap, isLatitude)) / 2.0
spawnLandOrWater(tile, elevation)
}
}
@ -141,10 +147,11 @@ class MapLandmassGenerator(val ruleset: Ruleset, val randomness: MapGenerationRa
return min(0.3, 1.0 - (5.0 * distanceFactor * distanceFactor + randomScale) / 3.0)
}
private fun getTwoContinentsTransform(tileInfo: TileInfo, tileMap: TileMap): Double {
private fun getTwoContinentsTransform(tileInfo: TileInfo, tileMap: TileMap, isLatitude: Boolean): Double {
// The idea here is to create a water area separating the two land areas.
// So what we do it create a line of water in the middle - where 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 latitudeFactor = abs(tileInfo.latitude) / tileMap.maxLatitude
var longitudeFactor = abs(tileInfo.longitude) / tileMap.maxLongitude
// If this is a world wrap, we want it to be separated on both sides -
@ -153,9 +160,11 @@ class MapLandmassGenerator(val ruleset: Ruleset, val randomness: MapGenerationRa
longitudeFactor = min(longitudeFactor,
(tileMap.maxLongitude - abs(tileInfo.longitude)) / tileMap.maxLongitude) * 1.5f
val factor = if (isLatitude) latitudeFactor else longitudeFactor
// 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
return min(0.2, -1.0 + (5.0 * longitudeFactor.pow(0.6f) + randomScale) / 3.0)
return min(0.2, -1.0 + (5.0 * factor.pow(0.6f) + randomScale) / 3.0)
}
private fun getFourCornersTransform(tileInfo: TileInfo, tileMap: TileMap): Double {

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

@ -94,7 +94,7 @@ class MapParametersTable(
val mapTypes = listOfNotNull(
MapType.default,
MapType.pangaea,
MapType.continents,
MapType.twoContinents,
MapType.fourCorners,
MapType.smoothedRandom,
MapType.archipelago,