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

Resolved #9689 - no city window on citybutton click

Browse Source
This commit is contained in:
Yair Morgenstern 2023-06-28 19:08:52 +03:00
parent 4a7f484900
commit 83270ddf8f
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/kotlin/BuildConfig.kt
View File

@ -4,8 +4,8 @@ package com.unciv.build
object BuildConfig { object BuildConfig {
const val kotlinVersion = "1.8.21" const val kotlinVersion = "1.8.21"
const val appName = "Unciv" const val appName = "Unciv"
const val appCodeNumber = 884 const val appCodeNumber = 885
const val appVersion = "4.7.5" const val appVersion = "4.7.5-patch1"
const val gdxVersion = "1.11.0" const val gdxVersion = "1.11.0"
const val ktorVersion = "2.2.3" const val ktorVersion = "2.2.3"

2
core/src/com/unciv/UncivGame.kt
View File

@ -536,7 +536,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci
companion object { companion object {
//region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT
val VERSION = Version("4.7.5", 884) val VERSION = Version("4.7.5-patch1", 885)
//endregion //endregion
lateinit var Current: UncivGame lateinit var Current: UncivGame

5
core/src/com/unciv/ui/screens/worldscreen/status/NextTurnButton.kt
View File

@ -162,8 +162,11 @@ class NextTurnButton : IconTextButton("", null, 30) {
.any { it.currentMovement > Constants.minimumMovementEpsilon && (it.isMoving() || it.isAutomated() || it.isExploring()) } -> .any { it.currentMovement > Constants.minimumMovementEpsilon && (it.isMoving() || it.isAutomated() || it.isExploring()) } ->
NextTurnAction("Move automated units", Color.LIGHT_GRAY, NextTurnAction("Move automated units", Color.LIGHT_GRAY,
"NotificationIcons/MoveAutomatedUnits") { "NotificationIcons/MoveAutomatedUnits") {
worldScreen.viewingCiv.hasMovedAutomatedUnits = true // Don't allow double-click of 'n' to spawn 2 processes trying to automate units
if (!worldScreen.isPlayersTurn) return@NextTurnAction
worldScreen.isPlayersTurn = false // Disable state changes worldScreen.isPlayersTurn = false // Disable state changes
worldScreen.viewingCiv.hasMovedAutomatedUnits = true
worldScreen.nextTurnButton.disable() worldScreen.nextTurnButton.disable()
Concurrency.run("Move automated units") { Concurrency.run("Move automated units") {
for (unit in worldScreen.viewingCiv.units.getCivUnits()) for (unit in worldScreen.viewingCiv.units.getCivUnits())