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

Pillage action now has a confirmation popup

Browse Source
This commit is contained in:
Yair Morgenstern
2020-07-31 11:14:06 +03:00
parent bf4f952485
commit 275348c70e
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View File

@ -62,7 +62,7 @@ object UnitActions {
addExplorationActions(unit, actionList) addExplorationActions(unit, actionList)
addPromoteAction(unit, actionList) addPromoteAction(unit, actionList)
addUnitUpgradeAction(unit, actionList) addUnitUpgradeAction(unit, actionList)
addPillageAction(unit, actionList) addPillageAction(unit, actionList, worldScreen)
addSetupAction(unit, actionList) addSetupAction(unit, actionList)
addFoundCityAction(unit, actionList, tile) addFoundCityAction(unit, actionList, tile)
addWorkerActions(unit, actionList, tile, worldScreen, unitTable) addWorkerActions(unit, actionList, tile, worldScreen, unitTable)
@ -171,14 +171,22 @@ object UnitActions {
}.takeIf { unit.currentMovement > 0 && !isSetUp }) }.takeIf { unit.currentMovement > 0 && !isSetUp })
} }
private fun addPillageAction(unit: MapUnit, actionList: ArrayList<UnitAction>) { private fun addPillageAction(unit: MapUnit, actionList: ArrayList<UnitAction>, worldScreen: WorldScreen) {
val pillageAction = getPillageAction(unit) val pillageAction = getPillageAction(unit)
if(pillageAction!=null) actionList += pillageAction if (pillageAction == null) return
val pillageWithConfirmationAction = UnitAction(type = UnitActionType.Pillage, action = {
if (!worldScreen.hasOpenPopups()) {
val pillageText = "Are you sure you want to pillage this [${unit.currentTile.improvement}]?"
YesNoPopup(pillageText, { pillageAction.action!!(); worldScreen.shouldUpdate = true }).open()
}
})
actionList += pillageWithConfirmationAction
} }
fun getPillageAction(unit: MapUnit): UnitAction? { fun getPillageAction(unit: MapUnit): UnitAction? {
val tile = unit.currentTile val tile = unit.currentTile
if (unit.type.isCivilian() || tile.improvement == null) return null if (unit.type.isCivilian() || tile.improvement == null) return null
return UnitAction( return UnitAction(
type = UnitActionType.Pillage, type = UnitActionType.Pillage,
action = { action = {