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

Added 'relevant city' to conditionals, taking the city from the relevant tile where no city provided directly (#10684)

Browse Source
This commit is contained in:
Yair Morgenstern
2023-12-10 22:59:45 +02:00
committed by GitHub
parent b3c7143e36
commit 69ce160ff9
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/com/unciv/models/ruleset/unique/Unique.kt
View File

@ -155,10 +155,15 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s
?: state.city?.getCenterTile()
}
val relevantCity by lazy {
state.city
?: relevantTile?.getCity()
}
val stateBasedRandom by lazy { Random(state.hashCode()) }
fun getResourceAmount(resourceName: String): Int {
if (state.city != null) return state.city.getResourceAmount(resourceName)
if (relevantCity != null) return relevantCity!!.getResourceAmount(resourceName)
if (state.civInfo != null) return state.civInfo.getResourceAmount(resourceName)
return 0
}
@ -171,8 +176,8 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s
/** Helper to simplify conditional tests requiring a City */
fun checkOnCity(predicate: (City.() -> Boolean)): Boolean {
if (state.city == null) return false
return state.city.predicate()
if (relevantCity == null) return false
return relevantCity!!.predicate()
}
/** Helper to simplify the "compare civ's current era with named era" conditions */