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

Resolved #10640 - start turn with unit selected

Browse Source
This commit is contained in:
Yair Morgenstern
2023-12-01 10:25:59 +02:00
parent f36b05f6c0
commit 37586370ea
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,6 @@ import com.unciv.Constants
import com.unciv.UncivGame import com.unciv.UncivGame
import com.unciv.logic.GameInfo import com.unciv.logic.GameInfo
import com.unciv.logic.UncivShowableException import com.unciv.logic.UncivShowableException
import com.unciv.logic.civilization.AlertType
import com.unciv.logic.civilization.Civilization import com.unciv.logic.civilization.Civilization
import com.unciv.logic.civilization.PlayerType import com.unciv.logic.civilization.PlayerType
import com.unciv.logic.civilization.diplomacy.DiplomaticStatus import com.unciv.logic.civilization.diplomacy.DiplomaticStatus
@ -94,7 +93,7 @@ class WorldScreen(
/** Indicates it's the player's ([viewingCiv]) turn */ /** Indicates it's the player's ([viewingCiv]) turn */
var isPlayersTurn = viewingCiv.isCurrentPlayer() var isPlayersTurn = viewingCiv.isCurrentPlayer()
internal set // only this class is allowed to make changes internal set // only this class is allowed to make changes
/** Selected civilization, used in spectator and replay mode, equals viewingCiv in ordinary games */ /** Selected civilization, used in spectator and replay mode, equals viewingCiv in ordinary games */
var selectedCiv = viewingCiv var selectedCiv = viewingCiv
@ -174,8 +173,8 @@ class WorldScreen(
val tileToCenterOn: Vector2 = val tileToCenterOn: Vector2 =
when { when {
viewingCiv.cities.isNotEmpty() && viewingCiv.getCapital() != null -> viewingCiv.getCapital()!!.location
viewingCiv.units.getCivUnits().any() -> viewingCiv.units.getCivUnits().first().getTile().position viewingCiv.units.getCivUnits().any() -> viewingCiv.units.getCivUnits().first().getTile().position
viewingCiv.cities.isNotEmpty() && viewingCiv.getCapital() != null -> viewingCiv.getCapital()!!.location
else -> Vector2.Zero else -> Vector2.Zero
} }
@ -419,7 +418,7 @@ class WorldScreen(
&& !gameInfo.oneMoreTurnMode && (viewingCiv.isDefeated() || gameInfo.checkForVictory())) { && !gameInfo.oneMoreTurnMode && (viewingCiv.isDefeated() || gameInfo.checkForVictory())) {
game.settings.autoPlay.stopAutoPlay() game.settings.autoPlay.stopAutoPlay()
} }
if (!hasOpenPopups() && !game.settings.autoPlay.isAutoPlaying() && isPlayersTurn) { if (!hasOpenPopups() && !game.settings.autoPlay.isAutoPlaying() && isPlayersTurn) {
when { when {
viewingCiv.shouldShowDiplomaticVotingResults() -> viewingCiv.shouldShowDiplomaticVotingResults() ->