AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #9556 - Transform uniques accept conditionals correctly

Browse Source
This commit is contained in:
Yair Morgenstern 2023-06-11 12:22:36 +03:00
parent 4dad953db9
commit a853851cb8
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActions.kt
View File

@ -42,7 +42,7 @@ object UnitActions {
val actionList = ArrayList<UnitAction>() val actionList = ArrayList<UnitAction>()
// Determined by unit uniques // Determined by unit uniques
addTransformAction(unit, actionList) addTransformActions(unit, actionList)
addParadropAction(unit, actionList) addParadropAction(unit, actionList)
addAirSweepAction(unit, actionList) addAirSweepAction(unit, actionList)
addSetupAction(unit, actionList) addSetupAction(unit, actionList)
@ -309,28 +309,27 @@ object UnitActions {
} }
} }
private fun addTransformAction( private fun addTransformActions(
unit: MapUnit, unit: MapUnit,
actionList: ArrayList<UnitAction> actionList: ArrayList<UnitAction>
) { ) {
val upgradeAction = getTransformAction(unit) val upgradeAction = getTransformActions(unit)
if (upgradeAction != null) actionList += upgradeAction actionList += upgradeAction
} }
/** */ /** */
private fun getTransformAction( private fun getTransformActions(
unit: MapUnit unit: MapUnit
): ArrayList<UnitAction>? { ): ArrayList<UnitAction> {
if (!unit.baseUnit().hasUnique(UniqueType.CanTransform)) return null // can't upgrade to anything
val unitTile = unit.getTile() val unitTile = unit.getTile()
val civInfo = unit.civ val civInfo = unit.civ
val stateForConditionals = StateForConditionals(unit = unit, civInfo = civInfo, tile = unitTile)
val transformList = ArrayList<UnitAction>() val transformList = ArrayList<UnitAction>()
for (unique in unit.baseUnit().getMatchingUniques(UniqueType.CanTransform, for (unique in unit.baseUnit().getMatchingUniques(UniqueType.CanTransform, stateForConditionals)) {
StateForConditionals(unit = unit, civInfo = civInfo, tile = unitTile))) {
val unitToTransformTo = civInfo.getEquivalentUnit(unique.params[0]) val unitToTransformTo = civInfo.getEquivalentUnit(unique.params[0])
val stateForConditionals = StateForConditionals(unit.civ, unit = unit) if (unitToTransformTo.getMatchingUniques(UniqueType.OnlyAvailableWhen)
if (unitToTransformTo.getMatchingUniques(UniqueType.OnlyAvailableWhen).any { !it.conditionalsApply(stateForConditionals) }) .any { !it.conditionalsApply(stateForConditionals) })
continue continue
// Check _new_ resource requirements // Check _new_ resource requirements