From 0c5e82487ef7c81cce3b718e2f6999960b31efae Mon Sep 17 00:00:00 2001
From: yairm210 <yairm210@hotmail.com>
Date: Thu, 8 Aug 2024 14:10:55 +0300
Subject: [PATCH] Add descriptor (you, friend name, or unknown) to current turn
 for mp games

---
 .../assets/jsons/translations/template.properties    |  2 ++
 .../screens/multiplayerscreens/MultiplayerHelpers.kt | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties
index 829a08a484..af85fd7766 100644
--- a/android/assets/jsons/translations/template.properties
+++ b/android/assets/jsons/translations/template.properties
@@ -1469,6 +1469,8 @@ Somewhere around [city] =
 Far away = 
 Status = 
 Current turn = 
+You =
+Unknown = 
 Turn [turnNumber] = 
 Location = 
 Unimproved = 
diff --git a/core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerHelpers.kt b/core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerHelpers.kt
index 13251512ef..04e613ee85 100644
--- a/core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerHelpers.kt
+++ b/core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerHelpers.kt
@@ -47,7 +47,17 @@ object MultiplayerHelpers {
         val preview = multiplayerGame.preview
         if (preview?.currentPlayer != null) {
             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
     }