Added an option to disable move by long press (#11681)

* Added an option to disable move by long press

* Moved setting check to tileGroup.onActivation and changed it to check for longTapMove

* Added translation
This commit is contained in:
Oskar Niesen 2024-06-04 10:02:01 -05:00 committed by GitHub
parent 4e28b9e75c
commit 9e6e157835
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 0 deletions

View File

@ -801,6 +801,7 @@ Gameplay =
Check for idle units = Check for idle units =
Auto Unit Cycle = Auto Unit Cycle =
Move units with a single tap = Move units with a single tap =
Move units with a long tap =
Auto-assign city production = Auto-assign city production =
Auto-build roads = Auto-build roads =
Automated workers replace improvements = Automated workers replace improvements =

View File

@ -36,6 +36,7 @@ class GameSettings {
var checkForDueUnits: Boolean = true var checkForDueUnits: Boolean = true
var autoUnitCycle: Boolean = true var autoUnitCycle: Boolean = true
var singleTapMove: Boolean = false var singleTapMove: Boolean = false
var longTapMove: Boolean = true
var language: String = Constants.english var language: String = Constants.english
@Transient @Transient
var locale: Locale? = null var locale: Locale? = null

View File

@ -19,6 +19,7 @@ fun gameplayTab(
optionsPopup.addCheckbox(this, "Check for idle units", settings.checkForDueUnits, true) { settings.checkForDueUnits = it } optionsPopup.addCheckbox(this, "Check for idle units", settings.checkForDueUnits, true) { settings.checkForDueUnits = it }
optionsPopup.addCheckbox(this, "Auto Unit Cycle", settings.autoUnitCycle, true) { settings.autoUnitCycle = it } optionsPopup.addCheckbox(this, "Auto Unit Cycle", settings.autoUnitCycle, true) { settings.autoUnitCycle = it }
optionsPopup.addCheckbox(this, "Move units with a single tap", settings.singleTapMove) { settings.singleTapMove = it } optionsPopup.addCheckbox(this, "Move units with a single tap", settings.singleTapMove) { settings.singleTapMove = it }
optionsPopup.addCheckbox(this, "Move units with a long tap", settings.longTapMove) { settings.longTapMove = it }
optionsPopup.addCheckbox(this, "Auto-assign city production", settings.autoAssignCityProduction, true) { shouldAutoAssignCityProduction -> optionsPopup.addCheckbox(this, "Auto-assign city production", settings.autoAssignCityProduction, true) { shouldAutoAssignCityProduction ->
settings.autoAssignCityProduction = shouldAutoAssignCityProduction settings.autoAssignCityProduction = shouldAutoAssignCityProduction
val worldScreen = GUI.getWorldScreenIfActive() val worldScreen = GUI.getWorldScreenIfActive()

View File

@ -149,6 +149,7 @@ class WorldMapHolder(
ActivationTypes.Longpress else ActivationTypes.RightClick, ActivationTypes.Longpress else ActivationTypes.RightClick,
noEquivalence = true noEquivalence = true
) { ) {
if (!UncivGame.Current.settings.longTapMove) return@onActivation
val unit = worldScreen.bottomUnitTable.selectedUnit val unit = worldScreen.bottomUnitTable.selectedUnit
?: return@onActivation ?: return@onActivation
Concurrency.run("WorldScreenClick") { Concurrency.run("WorldScreenClick") {