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

Resource revealed notification can point to all reveals (#3879)

Browse Source 
* May resolve #3862: Resource revealed notification can point to all reveals

* Resource revealed notification can point to all reveals - wording
This commit is contained in:
SomeTroglodyte 2021-05-06 15:08:35 +02:00 committed by GitHub
parent d11cf286b4
commit 7c34c5f440
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
core/src/com/unciv/logic/civilization/TechManager.kt
View File

@ -1,7 +1,9 @@
package com.unciv.logic.civilization
import com.unciv.logic.city.CityInfo
import com.unciv.logic.map.MapSize
import com.unciv.logic.map.RoadStatus
import com.unciv.logic.map.TileInfo
import com.unciv.models.ruleset.Unique
import com.unciv.models.ruleset.UniqueTriggerActivation
import com.unciv.models.ruleset.tech.Technology
@ -255,22 +257,7 @@ class TechManager {
}
}
for (revealedResource in getRuleset().tileResources.values.filter { techName == it.revealedBy }) {
val resourcesCloseToCities = civInfo.cities.asSequence()
.flatMap { it.getCenterTile().getTilesInDistance(3) + it.getTiles() }
.filter { it.resource == revealedResource.name && (it.getOwner() == civInfo || it.getOwner() == null) }
.distinct()
for (tileInfo in resourcesCloseToCities) {
val closestCityTile = tileInfo.getTilesInDistance(4)
.firstOrNull { it.isCityCenter() }
if (closestCityTile != null) {
val text = "[${revealedResource.name}] revealed near [${closestCityTile.getCity()!!.name}]"
civInfo.addNotification(text, tileInfo.position, "ResourceIcons/"+revealedResource.name)
break
}
}
}
if (civInfo.playerType == PlayerType.Human) notifyRevealedResources(techName)
val obsoleteUnits = getRuleset().units.values.filter { it.obsoleteTech == techName }.map { it.name }
for (city in civInfo.cities) {
@ -291,6 +278,45 @@ class TechManager {
}
}
private fun notifyRevealedResources(techName: String) {
data class CityTileAndDistance(val city: CityInfo, val tile: TileInfo, val distance: Int)
for (revealedResource in getRuleset().tileResources.values.filter { techName == it.revealedBy }) {
val revealedName = revealedResource.name
val visibleRevealTiles = civInfo.viewableTiles.asSequence()
.filter { it.resource == revealedName }
.flatMap { tile -> civInfo.cities.asSequence()
.map {
// build a full cross join all revealed tiles * civ's cities (should rarely surpass a few hundred)
// cache distance for each pair as sort will call it ~ 2n log n times
// should still be cheaper than looking up 'the' closest city per reveal tile before sorting
city -> CityTileAndDistance(city, tile, tile.aerialDistanceTo(city.getCenterTile()))
}
}
.sortedWith ( compareBy { it.distance } )
.distinctBy { it.tile }
val chosenCity = visibleRevealTiles.firstOrNull()?.city ?: continue
val positions = visibleRevealTiles
// re-sort to a more pleasant display order
.sortedWith(compareBy{ it.tile.aerialDistanceTo(chosenCity.getCenterTile()) })
.map { it.tile.position }
.toList() // explicit materialization of sequence to satisfy addNotification overload
val text = if(positions.size==1)
"[$revealedName] revealed near [${chosenCity.name}]"
else
"[${positions.size}] sources of [$revealedName] revealed, e.g. near [${chosenCity.name}]"
civInfo.addNotification(
text,
LocationAction(positions),
"ResourceIcons/" + revealedName
)
}
}
fun setTransients() {
researchedTechnologies.addAll(techsResearched.map { getRuleset().technologies[it]!! })
researchedTechUniques.addAll(researchedTechnologies.asSequence().flatMap { it.uniqueObjects.asSequence() })
@ -319,4 +345,4 @@ class TechManager {
fun canResearchTech(): Boolean {
return getRuleset().technologies.values.any { canBeResearched(it.name) }
}
}
}