AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resources can now again provide uniques applying to the entire civ (#6072)

Browse Source
This commit is contained in:
Xander Lenstra 2022-01-29 17:37:53 +01:00 committed by GitHub
parent 599a09176d
commit 39483d78bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -404,6 +404,11 @@ class CivilizationInfo {
if (religionManager.religion != null) if (religionManager.religion != null)
yieldAll(religionManager.religion!!.getFounderUniques().filter { it.isOfType(uniqueType) }) yieldAll(religionManager.religion!!.getFounderUniques().filter { it.isOfType(uniqueType) })
yieldAll(getCivResources().asSequence()
.filter { it.amount > 0 }
.flatMap { it.resource.getMatchingUniques(uniqueType, stateForConditionals) }
)
yieldAll(gameInfo.ruleSet.globalUniques.getMatchingUniques(uniqueType, stateForConditionals)) yieldAll(gameInfo.ruleSet.globalUniques.getMatchingUniques(uniqueType, stateForConditionals))
}.filter { }.filter {

5
core/src/com/unciv/models/ruleset/unique/UniqueType.kt
View File

@ -32,6 +32,7 @@ enum class UniqueTarget(val inheritsFrom: UniqueTarget? = null) {
// These are a bit of a lie. There's no "Promotion only" or "UnitType only" uniques, // These are a bit of a lie. There's no "Promotion only" or "UnitType only" uniques,
// they're all just Unit uniques in different places. // they're all just Unit uniques in different places.
// So there should be no uniqueType that has a Promotion or UnitType target. // So there should be no uniqueType that has a Promotion or UnitType target.
// Except meta-level uniques, such as 'incompatible with [promotion]', of course
Unit, Unit,
UnitType(Unit), UnitType(Unit),
Promotion(Unit), Promotion(Unit),
@ -39,7 +40,7 @@ enum class UniqueTarget(val inheritsFrom: UniqueTarget? = null) {
// Tile-specific // Tile-specific
Terrain, Terrain,
Improvement, Improvement,
Resource, Resource(Global),
Ruins, Ruins,
// Other // Other
@ -99,7 +100,7 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags:
NullifiesStat("Nullifies [stat] [cityFilter]", UniqueTarget.Global), NullifiesStat("Nullifies [stat] [cityFilter]", UniqueTarget.Global),
NullifiesGrowth("Nullifies Growth [cityFilter]", UniqueTarget.Global), NullifiesGrowth("Nullifies Growth [cityFilter]", UniqueTarget.Global),
PercentProductionWonders("[amount]% Production when constructing [buildingFilter] wonders [cityFilter]", UniqueTarget.Global, UniqueTarget.Resource, UniqueTarget.FollowerBelief), PercentProductionWonders("[amount]% Production when constructing [buildingFilter] wonders [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief),
PercentProductionBuildings("[amount]% Production when constructing [buildingFilter] buildings [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief), PercentProductionBuildings("[amount]% Production when constructing [buildingFilter] buildings [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief),
PercentProductionUnits("[amount]% Production when constructing [baseUnitFilter] units [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief), PercentProductionUnits("[amount]% Production when constructing [baseUnitFilter] units [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief),