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

BaseUnit unique-finding always takes Type uniques into account

Browse Source
This commit is contained in:
Yair Morgenstern 2023-07-21 15:09:14 +03:00
parent 33ae13479d
commit bc9b5615eb
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import com.unciv.models.ruleset.RejectionReasonType
import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.Ruleset
import com.unciv.models.ruleset.RulesetObject import com.unciv.models.ruleset.RulesetObject
import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.StateForConditionals
import com.unciv.models.ruleset.unique.Unique
import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.ruleset.unique.UniqueTarget
import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.stats.Stat import com.unciv.models.stats.Stat
@ -95,6 +96,15 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
return super.canBePurchasedWithStat(city, stat) return super.canBePurchasedWithStat(city, stat)
} }
/** Whenever we call .hasUniques() or .getMatchingUniques(), we also want to return the uniques from the unit type
* All of the IHasUniques functions converge to getMatchingUniques, so overriding this one function gives us all of them */
override fun getMatchingUniques(uniqueTemplate: String, stateForConditionals: StateForConditionals?): Sequence<Unique> {
val baseUnitMatchingUniques = super<RulesetObject>.getMatchingUniques(uniqueTemplate, stateForConditionals)
return if (::ruleset.isInitialized) baseUnitMatchingUniques +
type.getMatchingUniques(uniqueTemplate, stateForConditionals)
else baseUnitMatchingUniques // for e.g. Mod Checker, we may chech a BaseUnit's uniques without initializing ruleset
}
override fun getBaseBuyCost(city: City, stat: Stat): Float? { override fun getBaseBuyCost(city: City, stat: Stat): Float? {
return sequence { return sequence {
val baseCost = super.getBaseBuyCost(city, stat) val baseCost = super.getBaseBuyCost(city, stat)
@ -110,11 +120,11 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
override fun shouldBeDisplayed(cityConstructions: CityConstructions): Boolean { override fun shouldBeDisplayed(cityConstructions: CityConstructions): Boolean {
val rejectionReasons = getRejectionReasons(cityConstructions) val rejectionReasons = getRejectionReasons(cityConstructions)
return rejectionReasons.none { !it.shouldShow }
|| ( if (rejectionReasons.none { !it.shouldShow }) return true
canBePurchasedWithAnyStat(cityConstructions.city) if (canBePurchasedWithAnyStat(cityConstructions.city)
&& rejectionReasons.all { it.type == RejectionReasonType.Unbuildable } && rejectionReasons.all { it.type == RejectionReasonType.Unbuildable }) return true
) return false
} }
override fun getRejectionReasons(cityConstructions: CityConstructions): Sequence<RejectionReason> = sequence { override fun getRejectionReasons(cityConstructions: CityConstructions): Sequence<RejectionReason> = sequence {
@ -160,41 +170,30 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
if (!civ.gameInfo.gameParameters.nuclearWeaponsEnabled && isNuclearWeapon()) if (!civ.gameInfo.gameParameters.nuclearWeaponsEnabled && isNuclearWeapon())
yield(RejectionReasonType.DisabledBySetting.toInstance()) yield(RejectionReasonType.DisabledBySetting.toInstance())
for (unique in uniqueObjects.filter { it.conditionalsApply(civ, city) }) { val stateForConditionals = StateForConditionals(civ, city)
when (unique.type) {
UniqueType.Unbuildable ->
yield(RejectionReasonType.Unbuildable.toInstance())
UniqueType.FoundCity -> if (civ.isCityState() || civ.isOneCityChallenger()) if (hasUnique(UniqueType.Unbuildable, stateForConditionals))
yield(RejectionReasonType.NoSettlerForOneCityPlayers.toInstance()) yield(RejectionReasonType.Unbuildable.toInstance())
UniqueType.MaxNumberBuildable -> if (civ.civConstructions.countConstructedObjects( if ((civ.isCityState() || civ.isOneCityChallenger()) && hasUnique(UniqueType.FoundCity, stateForConditionals))
this@BaseUnit yield(RejectionReasonType.NoSettlerForOneCityPlayers.toInstance())
) >= unique.params[0].toInt()
)
yield(RejectionReasonType.MaxNumberBuildable.toInstance())
else -> {} if (getMatchingUniques(UniqueType.MaxNumberBuildable, stateForConditionals).any {
} civ.civConstructions.countConstructedObjects(this@BaseUnit) >= it.params[0].toInt()
} })
yield(RejectionReasonType.MaxNumberBuildable.toInstance())
if (!civ.isBarbarian()) { // Barbarians don't need resources if (!civ.isBarbarian()) { // Barbarians don't need resources
val civResources = Counter(civ.getCivResourcesByName()) + additionalResources val civResources = Counter(civ.getCivResourcesByName()) + additionalResources
for ((resource, requiredAmount) in getResourceRequirementsPerTurn()) { for ((resource, requiredAmount) in getResourceRequirementsPerTurn()) {
val availableAmount = civResources[resource] val availableAmount = civResources[resource]
if (availableAmount < requiredAmount) { if (availableAmount < requiredAmount) {
yield( val message = resource.getNeedMoreAmountString(requiredAmount - availableAmount)
RejectionReasonType.ConsumesResources.toInstance( yield(RejectionReasonType.ConsumesResources.toInstance(message))
resource.getNeedMoreAmountString(
requiredAmount - availableAmount
)
)
)
} }
} }
} }
val stateForConditionals = StateForConditionals(civ, city)
for (unique in civ.getMatchingUniques(UniqueType.CannotBuildUnits, stateForConditionals)) for (unique in civ.getMatchingUniques(UniqueType.CannotBuildUnits, stateForConditionals))
if (this@BaseUnit.matchesFilter(unique.params[0])) { if (this@BaseUnit.matchesFilter(unique.params[0])) {
val hasHappinessCondition = unique.conditionals.any { val hasHappinessCondition = unique.conditionals.any {