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

Added overload to MapUnit.getMatchingUniques to get uniques from civ as well - see #5494

Browse Source
This commit is contained in:
yairm210 2021-10-17 21:16:14 +03:00
parent d89211c6bb
commit 1a1194236b
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -207,10 +207,16 @@ class MapUnit {
fun getMatchingUniques(placeholderText: String): Sequence<Unique> =
tempUniques.asSequence().filter { it.placeholderText == placeholderText }
fun getMatchingUniques(uniqueType: UniqueType, stateForConditionals: StateForConditionals? = null) = sequence {
fun getMatchingUniques(
uniqueType: UniqueType,
stateForConditionals: StateForConditionals = StateForConditionals(civInfo, unit=this),
checkCivInfoUniques:Boolean = false
) = sequence {
yieldAll(tempUniques.asSequence()
.filter { it.type == uniqueType && it.conditionalsApply(stateForConditionals) }
)
if (checkCivInfoUniques)
yieldAll(civInfo.getMatchingUniques(uniqueType, stateForConditionals))
}
fun hasUnique(unique: String): Boolean {
@ -306,13 +312,11 @@ class MapUnit {
if (isEmbarked()) 2
else baseUnit.movement
movement += (getMatchingUniques(UniqueType.Movement, StateForConditionals(civInfo = civInfo, unit = this)) +
civInfo.getMatchingUniques(UniqueType.Movement, StateForConditionals(civInfo = civInfo, unit = this)))
movement += getMatchingUniques(UniqueType.Movement, checkCivInfoUniques = true)
.sumOf { it.params[0].toInt() }
// Deprecated since 3.17.5
for (unique in civInfo.getMatchingUniques(UniqueType.MovementUnits)
+ getMatchingUniques(UniqueType.MovementUnits))
for (unique in getMatchingUniques(UniqueType.MovementUnits, checkCivInfoUniques = true))
if (matchesFilter(unique.params[1]))
movement += unique.params[0].toInt()
@ -346,9 +350,7 @@ class MapUnit {
return 1
}
visibilityRange += (getMatchingUniques(UniqueType.Sight, StateForConditionals(civInfo = civInfo, unit = this))
+ civInfo.getMatchingUniques(UniqueType.Sight, StateForConditionals(civInfo = civInfo, unit = this))
).sumOf { it.params[0].toInt() }
visibilityRange += getMatchingUniques(UniqueType.Sight, checkCivInfoUniques = true).sumOf { it.params[0].toInt() }
// Deprecated since 3.17.5
for (unique in getMatchingUniques(UniqueType.SightUnits))
@ -1112,15 +1114,14 @@ class MapUnit {
fun getPressureAddedFromSpread(): Int {
var pressureAdded = baseUnit.religiousStrength.toFloat()
// Deprecated since 3.17.5
for (unique in civInfo.getMatchingUniques(UniqueType.SpreadReligionStrengthUnits))
if (matchesFilter(unique.params[0]))
pressureAdded *= unique.params[0].toPercent()
//
for (unique in getMatchingUniques(UniqueType.SpreadReligionStrength, StateForConditionals(civInfo = civInfo, unit = this))
+ civInfo.getMatchingUniques(UniqueType.SpreadReligionStrength, StateForConditionals(civInfo = civInfo, unit = this)))
for (unique in getMatchingUniques(UniqueType.SpreadReligionStrength, checkCivInfoUniques = true))
pressureAdded *= unique.params[0].toPercent()
return pressureAdded.toInt()