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

Added option for confirmation when clicking "next turn" button (#6925)

Browse Source
This commit is contained in:
alexban011 2022-05-24 22:32:35 +03:00 committed by GitHub
parent 4eaf3c8355
commit 93afb26c62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/translations/template.properties
View File

@ -656,6 +656,7 @@ Show unit movement arrows =
Continuous rendering = Continuous rendering =
When disabled, saves battery life but certain animations will be suspended = When disabled, saves battery life but certain animations will be suspended =
Order trade offers by amount = Order trade offers by amount =
Ask for confirmation when pressing next turn =
Check extension mods based on: = Check extension mods based on: =
-none- = -none- =
Reload mods = Reload mods =
@ -808,6 +809,7 @@ Waiting for other players... =
Waiting for [civName]... = Waiting for [civName]... =
in = in =
Next turn = Next turn =
Confirm next turn =
Move automated units = Move automated units =
[currentPlayerCiv] ready? = [currentPlayerCiv] ready? =
1 turn = 1 turn =

1
core/src/com/unciv/models/metadata/GameSettings.kt
View File

@ -48,6 +48,7 @@ class GameSettings {
var multiplayerTurnCheckerPersistentNotificationEnabled = true var multiplayerTurnCheckerPersistentNotificationEnabled = true
var multiplayerTurnCheckerDelayInMinutes = 5 var multiplayerTurnCheckerDelayInMinutes = 5
var orderTradeOffersByAmount = true var orderTradeOffersByAmount = true
var confirmNextTurn = false
var windowState = WindowState() var windowState = WindowState()
var isFreshlyCreated = false var isFreshlyCreated = false
var visualMods = HashSet<String>() var visualMods = HashSet<String>()

3
core/src/com/unciv/ui/options/GameplayTab.kt
View File

@ -33,4 +33,5 @@ fun gameplayTab(
settings.automatedWorkersReplaceImprovements settings.automatedWorkersReplaceImprovements
) { settings.automatedWorkersReplaceImprovements = it } ) { settings.automatedWorkersReplaceImprovements = it }
optionsPopup.addCheckbox(this, "Order trade offers by amount", settings.orderTradeOffersByAmount) { settings.orderTradeOffersByAmount = it } optionsPopup.addCheckbox(this, "Order trade offers by amount", settings.orderTradeOffersByAmount) { settings.orderTradeOffersByAmount = it }
} optionsPopup.addCheckbox(this, "Ask for confirmation when pressing next turn", settings.confirmNextTurn) { settings.confirmNextTurn = it }
}

12
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View File

@ -39,6 +39,7 @@ import com.unciv.ui.pickerscreens.*
import com.unciv.ui.popup.ExitGamePopup import com.unciv.ui.popup.ExitGamePopup
import com.unciv.ui.popup.Popup import com.unciv.ui.popup.Popup
import com.unciv.ui.popup.ToastPopup import com.unciv.ui.popup.ToastPopup
import com.unciv.ui.popup.YesNoPopup
import com.unciv.ui.popup.hasOpenPopups import com.unciv.ui.popup.hasOpenPopups
import com.unciv.ui.saves.LoadGameScreen import com.unciv.ui.saves.LoadGameScreen
import com.unciv.ui.saves.SaveGameScreen import com.unciv.ui.saves.SaveGameScreen
@ -822,8 +823,15 @@ class WorldScreen(val gameInfo: GameInfo, val viewingCiv:CivilizationInfo) : Bas
else -> else ->
NextTurnAction("${Fonts.turn}{Next turn}", Color.WHITE) { NextTurnAction("${Fonts.turn}{Next turn}", Color.WHITE) {
game.settings.addCompletedTutorialTask("Pass a turn") val action = {
nextTurn() game.settings.addCompletedTutorialTask("Pass a turn")
nextTurn()
}
if (game.settings.confirmNextTurn) {
YesNoPopup("Confirm next turn", action, this).open()
} else {
action()
}
} }
} }
} }