delete unnecessary random(randomness.RNG) (#7721)

This commit is contained in:
lishaoxia1985
2022-08-30 16:29:57 +08:00
committed by GitHub
parent f3a4340348
commit 63324b3272

View File

@ -225,21 +225,19 @@ class MapGenerator(val ruleset: Ruleset) {
val maxLakeSize = ruleset.modOptions.constants.maxLakeSize val maxLakeSize = ruleset.modOptions.constants.maxLakeSize
while (waterTiles.isNotEmpty()) { while (waterTiles.isNotEmpty()) {
val initialWaterTile = waterTiles.random(randomness.RNG) val initialWaterTile = waterTiles.removeFirst()
tilesInArea += initialWaterTile tilesInArea += initialWaterTile
tilesToCheck += initialWaterTile tilesToCheck += initialWaterTile
waterTiles -= initialWaterTile
// Floodfill to cluster water tiles // Floodfill to cluster water tiles
while (tilesToCheck.isNotEmpty()) { while (tilesToCheck.isNotEmpty()) {
val tileWeAreChecking = tilesToCheck.random(randomness.RNG) val tileWeAreChecking = tilesToCheck.removeFirst()
for (vector in tileWeAreChecking.neighbors for (vector in tileWeAreChecking.neighbors
.filter { !tilesInArea.contains(it) and waterTiles.contains(it) }) { .filter { !tilesInArea.contains(it) and waterTiles.contains(it) }) {
tilesInArea += vector tilesInArea += vector
tilesToCheck += vector tilesToCheck += vector
waterTiles -= vector waterTiles -= vector
} }
tilesToCheck -= tileWeAreChecking
} }
if (tilesInArea.size <= maxLakeSize) { if (tilesInArea.size <= maxLakeSize) {