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

Resolves #7080 - tileFilter matches resource name and uniques

Browse Source
This commit is contained in:
Yair Morgenstern
2022-06-08 19:52:45 +03:00
parent b15e949a33
commit 6c463797d8
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -749,13 +749,21 @@ open class TileInfo {
else -> { else -> {
if (terrainFeatures.contains(filter)) return true if (terrainFeatures.contains(filter)) return true
if (getAllTerrains().any { it.hasUnique(filter) }) return true if (getAllTerrains().any { it.hasUnique(filter) }) return true
// Resource type check is last - cannot succeed if no resource here // Resource type check is last - cannot succeed if no resource here
if (resource == null) return false if (resource == null) return false
// Checks 'luxury resource', 'strategic resource' and 'bonus resource' - only those that are visible of course // Checks 'luxury resource', 'strategic resource' and 'bonus resource' - only those that are visible of course
// not using hasViewableResource as observingCiv is often not passed in, // not using hasViewableResource as observingCiv is often not passed in,
// and we want to be able to at least test for non-strategic in that case. // and we want to be able to at least test for non-strategic in that case.
val resourceObject = tileResource val resourceObject = tileResource
if (resourceObject.resourceType.name + " resource" != filter) return false // filter match val hasResourceWithFilter =
tileResource.name == filter
|| tileResource.hasUnique(filter)
|| tileResource.resourceType.name + " resource" == filter
if (!hasResourceWithFilter) return false
// Now that we know that this resource matches the filter - can the observer see that there's a resource here?
if (resourceObject.revealedBy == null) return true // no need for tech if (resourceObject.revealedBy == null) return true // no need for tech
if (observingCiv == null) return false // can't check tech if (observingCiv == null) return false // can't check tech
return observingCiv.tech.isResearched(resourceObject.revealedBy!!) return observingCiv.tech.isResearched(resourceObject.revealedBy!!)