From c992995b6ff9d7b4f283ed5303479db6065d5cda Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sat, 30 Nov 2019 23:11:46 +0200
Subject: [PATCH] Can now pick Random civ in player picker

---
 .../com/unciv/ui/newgamescreen/NationTable.kt |  4 +-
 .../ui/newgamescreen/PlayerPickerTable.kt     | 51 +++++++++++++------
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/core/src/com/unciv/ui/newgamescreen/NationTable.kt b/core/src/com/unciv/ui/newgamescreen/NationTable.kt
index 718118efa2..fe04603e3b 100644
--- a/core/src/com/unciv/ui/newgamescreen/NationTable.kt
+++ b/core/src/com/unciv/ui/newgamescreen/NationTable.kt
@@ -9,10 +9,9 @@ import com.unciv.models.gamebasics.Translations
 import com.unciv.models.gamebasics.tr
 import com.unciv.ui.utils.CameraStageBaseScreen
 import com.unciv.ui.utils.ImageGetter
-import com.unciv.ui.utils.onClick
 import com.unciv.ui.utils.toLabel
 
-class NationTable(val nation: Nation, width:Float, onClick:()->Unit)
+class NationTable(val nation: Nation, width:Float)
     : Table(CameraStageBaseScreen.skin) {
     private val innerTable = Table()
 
@@ -27,7 +26,6 @@ class NationTable(val nation: Nation, width:Float, onClick:()->Unit)
         innerTable.add(titleTable).row()
 
         innerTable.add(getUniqueLabel(nation).apply { setWrap(true) }).width(width)
-        onClick { onClick() }
         touchable = Touchable.enabled
         add(innerTable)
     }
diff --git a/core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt b/core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt
index 20670abc8a..03e8bff088 100644
--- a/core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt
+++ b/core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt
@@ -111,24 +111,45 @@ class PlayerPickerTable(val newGameScreen: NewGameScreen, val newGameParameters:
         nationTable.add(player.chosenCiv.toLabel()).pad(20f)
         nationTable.touchable = Touchable.enabled
         nationTable.onClick {
-            val nationsPopup = PopupTable(newGameScreen)
-            val nationListTable = Table()
-            for (nation in GameBasics.Nations.values.filter { !it.isCityState() && it.name != "Barbarians" }) {
-                if (player.chosenCiv != nation.name && newGameParameters.players.any { it.chosenCiv == nation.name })
-                    continue
-
-                nationListTable.add(NationTable(nation, halfWidth) {
-                    player.chosenCiv = nation.name
-                    nationsPopup.close()
-                    update()
-                }).pad(10f).width(halfWidth).row()
-            }
-            nationsPopup.add(ScrollPane(nationListTable)).height(newGameScreen.stage.height * 0.8f)
-            nationsPopup.open()
-            update()
+            popupNationPicker(player)
         }
         return nationTable
     }
+
+    private fun popupNationPicker(player: Player) {
+        val nationsPopup = PopupTable(newGameScreen)
+        val nationListTable = Table()
+
+        val randomPlayerTable = Table()
+        randomPlayerTable.background = ImageGetter.getBackground(Color.BLACK)
+
+        randomPlayerTable.add("?".toLabel(Color.BLACK, 30)
+                .apply { this.setAlignment(Align.center) }
+                .surroundWithCircle(50f)).pad(10f)
+        randomPlayerTable.add("Random".toLabel())
+        randomPlayerTable.touchable = Touchable.enabled
+        randomPlayerTable.onClick {
+            player.chosenCiv = "Random"
+            nationsPopup.close()
+            update()
+        }
+        nationListTable.add(randomPlayerTable).pad(10f).width(halfWidth).row()
+
+
+        for (nation in GameBasics.Nations.values.filter { !it.isCityState() && it.name != "Barbarians" }) {
+            if (player.chosenCiv != nation.name && newGameParameters.players.any { it.chosenCiv == nation.name })
+                continue
+
+            nationListTable.add(NationTable(nation, halfWidth).onClick {
+                player.chosenCiv = nation.name
+                nationsPopup.close()
+                update()
+            }).pad(10f).width(halfWidth).row()
+        }
+        nationsPopup.add(ScrollPane(nationListTable)).height(newGameScreen.stage.height * 0.8f)
+        nationsPopup.open()
+        update()
+    }
 }