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

Unit actions from Uniques shouldn't be active at zero movement (#11188)

Browse Source
This commit is contained in:
SomeTroglodyte 2024-02-24 21:41:39 +01:00 committed by GitHub
parent 04083de766
commit dd1f0142f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsFromUniques.kt
View File

@ -199,12 +199,15 @@ object UnitActionsFromUniques {
}
val title = UnitActionModifiers.actionTextWithSideEffects(baseTitle, unique, unit)
val triggerFunction = UniqueTriggerActivation.getTriggerFunction(unique, unit.civ, unit = unit, tile = unit.currentTile)
val unitAction = if (triggerFunction == null) null else
{ -> // This is the *action* that will be triggered!
UniqueTriggerActivation.triggerUnique(unique, unit)
UnitActionModifiers.activateSideEffects(unit, unique)
}
val unitAction = fun (): (()->Unit)? {
if (unit.currentMovement == 0f) return null
val triggerFunction = UniqueTriggerActivation.getTriggerFunction(unique, unit.civ, unit = unit, tile = unit.currentTile)
?: return null
return { // This is the *action* that will be triggered!
triggerFunction.invoke()
UnitActionModifiers.activateSideEffects(unit, unique)
}
}()
yield(UnitAction(UnitActionType.TriggerUnique, title, action = unitAction))
}