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

chore: more modifier cleanups

Browse Source
This commit is contained in:
yairm210
2024-08-04 22:07:47 +03:00
parent b76534a883
commit cf9309c165
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,7 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s
fun hasFlag(flag: UniqueFlag) = type != null && type.flags.contains(flag) fun hasFlag(flag: UniqueFlag) = type != null && type.flags.contains(flag)
fun isHiddenToUsers() = hasFlag(UniqueFlag.HiddenToUsers) || hasModifier(UniqueType.ModifierHiddenFromUsers) fun isHiddenToUsers() = hasFlag(UniqueFlag.HiddenToUsers) || hasModifier(UniqueType.ModifierHiddenFromUsers)
fun getModifiers(type: UniqueType) = modifiers.filter { it.type == type } fun getModifiers(type: UniqueType) = modifiers.asSequence().filter { it.type == type }
fun hasModifier(type: UniqueType) = getModifiers(type).any() fun hasModifier(type: UniqueType) = getModifiers(type).any()
fun isModifiedByGameSpeed() = hasModifier(UniqueType.ModifiedByGameSpeed) fun isModifiedByGameSpeed() = hasModifier(UniqueType.ModifiedByGameSpeed)
fun hasTriggerConditional(): Boolean { fun hasTriggerConditional(): Boolean {

4
core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
View File

@ -442,9 +442,7 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
fun isProbablySiegeUnit() = isRanged() fun isProbablySiegeUnit() = isRanged()
&& getMatchingUniques(UniqueType.Strength, StateForConditionals.IgnoreConditionals) && getMatchingUniques(UniqueType.Strength, StateForConditionals.IgnoreConditionals)
.any { it.params[0].toInt() > 0 .any { it.params[0].toInt() > 0 && it.hasModifier(UniqueType.ConditionalVsCity) }
&& it.modifiers.any { conditional -> conditional.type == UniqueType.ConditionalVsCity }
}
fun getForceEvaluation(): Int { fun getForceEvaluation(): Int {
if (cachedForceEvaluation < 0) evaluateForce() if (cachedForceEvaluation < 0) evaluateForce()

2
core/src/com/unciv/models/ruleset/validation/Suppression.kt
View File

@ -89,7 +89,7 @@ object Suppression {
suppressions += sourceObject.getMatchingUniques(UniqueType.SuppressWarnings, StateForConditionals.IgnoreConditionals).map { getWildcardFilter(it) } suppressions += sourceObject.getMatchingUniques(UniqueType.SuppressWarnings, StateForConditionals.IgnoreConditionals).map { getWildcardFilter(it) }
// Allow suppressing from modifiers in the same Unique // Allow suppressing from modifiers in the same Unique
if (sourceUnique != null) if (sourceUnique != null)
suppressions += sourceUnique.modifiers.filter { it.type == UniqueType.SuppressWarnings }.map { getWildcardFilter(it) } suppressions += sourceUnique.getModifiers(UniqueType.SuppressWarnings).map { getWildcardFilter(it) }
for (filter in suppressions) for (filter in suppressions)
if (matchesFilter(error, filter)) return true if (matchesFilter(error, filter)) return true

4
core/src/com/unciv/ui/objectdescriptions/TechnologyDescriptions.kt
View File

@ -343,9 +343,7 @@ object TechnologyDescriptions {
/** Tests whether a Unique is enabled or disabled by [techName] */ /** Tests whether a Unique is enabled or disabled by [techName] */
private fun Unique.isRelatedToTech(techName: String) = private fun Unique.isRelatedToTech(techName: String) =
modifiers.any { modifiers.any { it.isTechConditional() && it.params[0] == techName }
it.isTechConditional() && it.params[0] == techName
}
/** Used by [getAffectedImprovements] only */ /** Used by [getAffectedImprovements] only */
private data class ImprovementAndUnique(val improvement: TileImprovement, val unique: Unique) { private data class ImprovementAndUnique(val improvement: TileImprovement, val unique: Unique) {