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

Don't spawn nat wonders next to start location

Browse Source
This commit is contained in:
Yair Morgenstern
2024-01-19 11:37:36 +02:00
parent a73b159498
commit 8977f8f7cc
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/logic/map/mapgenerator/NaturalWonderGenerator.kt
View File

@ -56,9 +56,11 @@ class NaturalWonderGenerator(val ruleset: Ruleset, val randomness: MapGeneration
} }
} }
val tilesTooCloseToSpawnLocations = tileMap.startingLocationsByNation.values.flatten().flatMap { it.getTilesInDistance(5) }.toSet()
// First attempt to spawn the chosen wonders in order of least candidate tiles // First attempt to spawn the chosen wonders in order of least candidate tiles
chosenWonders.forEach { chosenWonders.forEach {
wonderCandidateTiles[it] = getCandidateTilesForWonder(tileMap, it) wonderCandidateTiles[it] = getCandidateTilesForWonder(tileMap, it, tilesTooCloseToSpawnLocations)
} }
chosenWonders.sortBy { wonderCandidateTiles[it]!!.size } chosenWonders.sortBy { wonderCandidateTiles[it]!!.size }
for (wonder in chosenWonders) { for (wonder in chosenWonders) {
@ -66,11 +68,12 @@ class NaturalWonderGenerator(val ruleset: Ruleset, val randomness: MapGeneration
spawned.add(wonder) spawned.add(wonder)
} }
// If some wonders were not able to be spawned we will pull a wonder from the fallback list // If some wonders were not able to be spawned we will pull a wonder from the fallback list
if (spawned.size < numberToSpawn) { if (spawned.size < numberToSpawn) {
// Now we have to do some more calculations. Unfortunately we have to calculate candidate tiles for everyone. // Now we have to do some more calculations. Unfortunately we have to calculate candidate tiles for everyone.
allNaturalWonders.forEach { allNaturalWonders.forEach {
wonderCandidateTiles[it] = getCandidateTilesForWonder(tileMap, it) wonderCandidateTiles[it] = getCandidateTilesForWonder(tileMap, it, tilesTooCloseToSpawnLocations)
} }
allNaturalWonders.sortBy { wonderCandidateTiles[it]!!.size } allNaturalWonders.sortBy { wonderCandidateTiles[it]!!.size }
for (wonder in allNaturalWonders) { for (wonder in allNaturalWonders) {
@ -87,7 +90,7 @@ class NaturalWonderGenerator(val ruleset: Ruleset, val randomness: MapGeneration
private fun Unique.getIntParam(index: Int) = params[index].toInt() private fun Unique.getIntParam(index: Int) = params[index].toInt()
private fun getCandidateTilesForWonder(tileMap: TileMap, naturalWonder: Terrain): Collection<Tile> { private fun getCandidateTilesForWonder(tileMap: TileMap, naturalWonder: Terrain, tilesTooCloseToSpawnLocations: Set<Tile>): Collection<Tile> {
val continentsRelevant = naturalWonder.hasUnique(UniqueType.NaturalWonderLargerLandmass) || val continentsRelevant = naturalWonder.hasUnique(UniqueType.NaturalWonderLargerLandmass) ||
naturalWonder.hasUnique(UniqueType.NaturalWonderSmallerLandmass) naturalWonder.hasUnique(UniqueType.NaturalWonderSmallerLandmass)
val sortedContinents = if (continentsRelevant) val sortedContinents = if (continentsRelevant)
@ -99,6 +102,7 @@ class NaturalWonderGenerator(val ruleset: Ruleset, val randomness: MapGeneration
val suitableLocations = tileMap.values.filter { tile-> val suitableLocations = tileMap.values.filter { tile->
tile.resource == null && tile.resource == null &&
tile !in tilesTooCloseToSpawnLocations &&
naturalWonder.occursOn.contains(tile.lastTerrain.name) && naturalWonder.occursOn.contains(tile.lastTerrain.name) &&
naturalWonder.uniqueObjects.all { unique -> naturalWonder.uniqueObjects.all { unique ->
when (unique.type) { when (unique.type) {