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

Add descriptor (you, friend name, or unknown) to current turn for mp games

Browse Source
This commit is contained in:
yairm210
2024-08-08 14:10:55 +03:00
parent bffeb10144
commit 0c5e82487e
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1469,6 +1469,8 @@ Somewhere around [city] =
Far away = Far away =
Status = Status =
Current turn = Current turn =
You =
Unknown =
Turn [turnNumber] = Turn [turnNumber] =
Location = Location =
Unimproved = Unimproved =

12
core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerHelpers.kt
View File

@ -47,7 +47,17 @@ object MultiplayerHelpers {
val preview = multiplayerGame.preview val preview = multiplayerGame.preview
if (preview?.currentPlayer != null) { if (preview?.currentPlayer != null) {
val currentTurnStartTime = Instant.ofEpochMilli(preview.currentTurnStartTime) val currentTurnStartTime = Instant.ofEpochMilli(preview.currentTurnStartTime)
descriptionText.appendLine("Current Turn: [${preview.currentPlayer}] since [${Duration.between(currentTurnStartTime, Instant.now()).formatShort()}] ago".tr()) val currentPlayer = preview.getCurrentPlayerCiv()
val playerDescriptor = if (currentPlayer.playerId == UncivGame.Current.settings.multiplayer.userId) {
"You"
} else {
val friend = UncivGame.Current.settings.multiplayer.friendList
.firstOrNull{ it.playerID == currentPlayer.playerId }
friend?.name ?: "Unknown"
}
val playerText = "{${preview.currentPlayer}}{ }({$playerDescriptor})"
descriptionText.appendLine("Current Turn: [$playerText] since [${Duration.between(currentTurnStartTime, Instant.now()).formatShort()}] ago".tr())
} }
return descriptionText return descriptionText
} }