mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-13 17:28:57 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #11865 - unified unit availability checks to one function

Browse Source
This commit is contained in:
yairm210
2024-06-27 15:16:58 +03:00
parent 7b89d1ef57
commit 195a251ff3
1 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,42 +171,34 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
return false
}
override fun getRejectionReasons(cityConstructions: CityConstructions): Sequence<RejectionReason> = sequence {
if (isWaterUnit() && !cityConstructions.city.isCoastal())
yield(RejectionReasonType.WaterUnitsInCoastalCities.toInstance())
val civInfo = cityConstructions.city.civ
for (unique in getMatchingUniques(UniqueType.OnlyAvailable, StateForConditionals.IgnoreConditionals))
yieldAll(notMetRejections(unique, cityConstructions))
for (unique in getMatchingUniques(UniqueType.CanOnlyBeBuiltWhen, StateForConditionals.IgnoreConditionals))
yieldAll(notMetRejections(unique, cityConstructions, true))
for (unique in getMatchingUniques(UniqueType.Unavailable, StateForConditionals(civInfo, cityConstructions.city)))
yield(RejectionReasonType.ShouldNotBeDisplayed.toInstance())
for (unique in getMatchingUniques(UniqueType.RequiresPopulation))
if (unique.params[0].toInt() > cityConstructions.city.population.population)
yield(RejectionReasonType.PopulationRequirement.toInstance(unique.getDisplayText()))
yieldAll(getRejectionReasons(civInfo, cityConstructions.city))
// Expensive, since adding and removing the fake unit causes side-effects
if (isAirUnit()) {
// Not actually added to civ so doesn't require destroy
val fakeUnit = getMapUnit(cityConstructions.city.civ, Constants.NO_ID)
val canUnitEnterTile = fakeUnit.movement.canMoveTo(cityConstructions.city.getCenterTile())
if (!canUnitEnterTile)
yield(RejectionReasonType.NoPlaceToPutUnit.toInstance())
}
}
override fun getRejectionReasons(cityConstructions: CityConstructions): Sequence<RejectionReason> =
getRejectionReasons(cityConstructions.city.civ, cityConstructions.city)
fun getRejectionReasons(
civ: Civilization,
city: City? = null,
additionalResources: Counter<String> = Counter.ZERO
): Sequence<RejectionReason> = sequence {
val stateForConditionals = StateForConditionals(civ, city)
if (city != null && isWaterUnit() && !city.isCoastal())
yield(RejectionReasonType.WaterUnitsInCoastalCities.toInstance())
for (unique in getMatchingUniques(UniqueType.OnlyAvailable, StateForConditionals.IgnoreConditionals))
yieldAll(notMetRejections(unique, civ, city))
for (unique in getMatchingUniques(UniqueType.CanOnlyBeBuiltWhen, StateForConditionals.IgnoreConditionals))
yieldAll(notMetRejections(unique, civ, city, true))
for (unique in getMatchingUniques(UniqueType.Unavailable, stateForConditionals))
yield(RejectionReasonType.ShouldNotBeDisplayed.toInstance())
if (city != null)
for (unique in getMatchingUniques(UniqueType.RequiresPopulation))
if (unique.params[0].toInt() > city.population.population)
yield(RejectionReasonType.PopulationRequirement.toInstance(unique.getDisplayText()))
for (requiredTech: String in requiredTechs())
if (!civ.tech.isResearched(requiredTech))
yield(RejectionReasonType.RequiresTech.toInstance("$requiredTech not researched"))
@ -222,8 +214,6 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
if (isHiddenBySettings(civ.gameInfo))
yield(RejectionReasonType.DisabledBySetting.toInstance())
val stateForConditionals = StateForConditionals(civ, city)
if (hasUnique(UniqueType.Unbuildable, stateForConditionals))
yield(RejectionReasonType.Unbuildable.toInstance())
@ -255,6 +245,15 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
yield(RejectionReasonType.CannotBeBuiltUnhappiness.toInstance(unique.getDisplayText()))
else yield(RejectionReasonType.CannotBeBuilt.toInstance())
}
// Expensive, since adding and removing the fake unit causes side-effects
if (city != null && isAirUnit()) {
// Not actually added to civ so doesn't require destroy
val fakeUnit = getMapUnit(civ, Constants.NO_ID)
val canUnitEnterTile = fakeUnit.movement.canMoveTo(city.getCenterTile())
if (!canUnitEnterTile)
yield(RejectionReasonType.NoPlaceToPutUnit.toInstance())
}
}
/**
@ -262,11 +261,10 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
* Also custom handles [UniqueType.ConditionalBuildingBuiltAmount], and
* [UniqueType.ConditionalBuildingBuiltAll]
*/
private fun notMetRejections(unique: Unique, cityConstructions: CityConstructions, built: Boolean=false): Sequence<RejectionReason> = sequence {
val civ = cityConstructions.city.civ
private fun notMetRejections(unique: Unique, civ: Civilization, city: City?, built: Boolean=false): Sequence<RejectionReason> = sequence {
for (conditional in unique.conditionals) {
// We yield a rejection only when conditionals are NOT met
if (Conditionals.conditionalApplies(unique, conditional, StateForConditionals(civ, cityConstructions.city)))
if (Conditionals.conditionalApplies(unique, conditional, StateForConditionals(civ, city)))
continue
when (conditional.type) {
UniqueType.ConditionalBuildingBuiltAmount -> {