wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bonus and Luxury resources are spread out evenly over the map

Browse source
This commit is contained in:
Yair Morgenstern 2019-10-14 23:00:55 +03:00
parent 0f351ad964
commit 35a96dbed4
5 changed files with 550 additions and 512 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/Images/TileSets/FantasyHex/Units/Scout.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 359 B

1007
android/assets/game.atlas
View file

File diff suppressed because it is too large Load diff

BIN
android/assets/game.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1 MiB

After

Width:  |  Height:  |  Size: 1 MiB

2
core/src/com/unciv/UnCivGame.kt
View file

@ -23,7 +23,7 @@ class UnCivGame(val version: String) : Game() {
* This exists so that when debugging we can see the entire map.
* Remember to turn this to false before commit and upload!
*/
var viewEntireMapForDebug = false
var viewEntireMapForDebug = true
/** For when you need to test something in an advanced game and don't have time to faff around */
val superchargedForDebug = false

53
core/src/com/unciv/logic/map/RandomMapGenerator.kt
View file

@ -3,6 +3,7 @@ package com.unciv.logic.map
import com.badlogic.gdx.math.Vector2
import com.unciv.Constants
import com.unciv.logic.HexMath
import com.unciv.models.Counter
import com.unciv.models.gamebasics.GameBasics
import com.unciv.models.gamebasics.tile.ResourceType
import com.unciv.models.gamebasics.tile.TerrainType
@ -82,7 +83,7 @@ class CelluarAutomataRandomMapGenerator(): SeedRandomMapGenerator() {
for(tile in mapToReturn.values) randomizeTile(tile,mapToReturn)
randomizeStrategicResources(mapToReturn,distance)
randomizeResources(mapToReturn,distance)
return mapToReturn
}
@ -248,7 +249,7 @@ class PerlinNoiseRandomMapGenerator:SeedRandomMapGenerator(){
for(tile in mapToReturn.values) randomizeTile(tile,mapToReturn)
randomizeStrategicResources(mapToReturn,distance)
randomizeResources(mapToReturn,distance)
return mapToReturn
}
@ -355,7 +356,7 @@ open class SeedRandomMapGenerator : RandomMapGenerator() {
for (entry in map) randomizeTile(entry.value, mapToReturn)
setWaterTiles(mapToReturn)
randomizeStrategicResources(mapToReturn,distance)
randomizeResources(mapToReturn,distance)
return mapToReturn
}
@ -521,21 +522,51 @@ open class RandomMapGenerator {
}
fun randomizeStrategicResources(mapToReturn: HashMap<String, TileInfo>,distance: Int) {
fun randomizeResources(mapToReturn: HashMap<String, TileInfo>, distance: Int) {
for(tile in mapToReturn.values)
if(tile.resource!=null && tile.getTileResource().resourceType==ResourceType.Strategic)
if(tile.resource!=null)
tile.resource=null
val strategicResources = GameBasics.TileResources.values.filter { it.resourceType==ResourceType.Strategic }
for(resource in strategicResources){
randomizeStrategicResources(mapToReturn, distance, ResourceType.Strategic)
randomizeResource(mapToReturn, distance, ResourceType.Luxury)
randomizeResource(mapToReturn, distance, ResourceType.Bonus)
}
// Here, we need each specific resource to be spread over the map - it matters less if specific resources are near each other
private fun randomizeStrategicResources(mapToReturn: HashMap<String, TileInfo>, distance: Int, resourceType: ResourceType) {
val resourcesOfType = GameBasics.TileResources.values.filter { it.resourceType == resourceType }
for (resource in resourcesOfType) {
val suitableTiles = mapToReturn.values
.filter { it.resource==null && resource.terrainsCanBeFoundOn.contains(it.getLastTerrain().name) }
.filter { it.resource == null && resource.terrainsCanBeFoundOn.contains(it.getLastTerrain().name) }
val numberOfResources = mapToReturn.values.count{it.isLand && !it.getBaseTerrain().impassable} / 50
val averageTilesPerResource = 15 * resourcesOfType.count()
val numberOfResources = mapToReturn.values.count { it.isLand && !it.getBaseTerrain().impassable } / averageTilesPerResource
val locations = chooseSpreadOutLocations(numberOfResources,suitableTiles, distance)
val locations = chooseSpreadOutLocations(numberOfResources, suitableTiles, distance)
for(location in locations) location.resource = resource.name
for (location in locations) location.resource = resource.name
}
}
// Here, we need there to be some luxury/bonus resource - it matters less what
private fun randomizeResource(mapToReturn: HashMap<String, TileInfo>, distance: Int, resourceType: ResourceType) {
val resourcesOfType = GameBasics.TileResources.values.filter { it.resourceType == resourceType }
val suitableTiles = mapToReturn.values
.filter { it.resource == null && resourcesOfType.any { r->r.terrainsCanBeFoundOn.contains(it.getLastTerrain().name) } }
val numberOfResources = mapToReturn.values.count { it.isLand && !it.getBaseTerrain().impassable } / 15
val locations = chooseSpreadOutLocations(numberOfResources, suitableTiles, distance)
val resourceToNumber = Counter<String>()
for(tile in locations){
val possibleResources = resourcesOfType
.filter { it.terrainsCanBeFoundOn.contains(tile.getLastTerrain().name) }
.map { it.name }
if(possibleResources.isEmpty()) continue
val resourceWithLeastAssignments = possibleResources.minBy { resourceToNumber[it]!! }!!
resourceToNumber.add(resourceWithLeastAssignments, 1)
tile.resource = resourceWithLeastAssignments
}
}