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

Code cleanup

Browse Source
This commit is contained in:
Yair Morgenstern
2022-02-01 12:36:08 +02:00
parent 3c2dda3ad4
commit 8c4bc2927c
3 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -862,12 +862,5 @@ class CityInfo {
// Note that we don't query religion here, as those only have local effects
}
// Get all uniques that don't apply to only this city
fun getAllUniquesWithNonLocalEffects(): Sequence<Unique> {
return cityConstructions.builtBuildingUniqueMap.getAllUniques()
.filter { !it.isLocalEffect }
// Note that we don't query religion here, as those only have local effects
}
//endregion
}

11
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -373,16 +373,7 @@ class CivilizationInfo {
fun hasResource(resourceName: String): Boolean = getCivResourcesByName()[resourceName]!! > 0
// This function should be removed and replaced by marking where uniques originate from, hopefully.
fun getCivWideBuildingUniques(cityItIsFor: CityInfo): Sequence<Unique> =
cities.asSequence().flatMap {
city ->
if (city == cityItIsFor)
city.getAllUniquesWithNonLocalEffects().filter { !it.isAntiLocalEffect }
else city.getAllUniquesWithNonLocalEffects()
}
fun hasUnique(uniqueType: UniqueType, stateForConditionals: StateForConditionals? =
fun hasUnique(uniqueType: UniqueType, stateForConditionals: StateForConditionals? =
StateForConditionals(this)) = getMatchingUniques(uniqueType, stateForConditionals).any()
fun hasUnique(unique: String) = getMatchingUniques(unique).any()

3
core/src/com/unciv/models/ruleset/Building.kt
View File

@ -181,8 +181,7 @@ class Building : RulesetStatsObject(), INonPerpetualConstruction {
@Suppress("RemoveRedundantQualifierName") // make it clearer Building inherits Stats
for (unique in getMatchingUniques(UniqueType.StatsWithResource))
if (civInfo.hasResource(unique.params[1])
&& Stats.isStats(unique.params[0]))
if (civInfo.hasResource(unique.params[1]))
stats.add(unique.stats)
if (!isWonder)