From 2ab8caeaea526db3f4cc32ccacf176fe8026442c Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Tue, 30 Apr 2019 21:21:45 +0300
Subject: [PATCH] City states option locked away, so it doesn't affect users
 yet

---
 core/src/com/unciv/ui/NewGameScreen.kt | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/core/src/com/unciv/ui/NewGameScreen.kt b/core/src/com/unciv/ui/NewGameScreen.kt
index 72205b86f0..d05c0989d7 100644
--- a/core/src/com/unciv/ui/NewGameScreen.kt
+++ b/core/src/com/unciv/ui/NewGameScreen.kt
@@ -176,13 +176,9 @@ class NewGameScreen: PickerScreen(){
         enemiesSelectBox.selected = newGameParameters.numberOfEnemies
         newGameOptionsTable.add(enemiesSelectBox).pad(10f).row()
 
-        newGameOptionsTable.add("{Number of city states}:".tr())
-        val cityStatesSelectBox = SelectBox<Int>(skin)
-        val cityStatesArray = Array<Int>()
-        (0..GameBasics.Nations.filter{ it.value.isCityState() }.size).forEach { cityStatesArray.add(it) }
-        cityStatesSelectBox.items = cityStatesArray
-        cityStatesSelectBox.selected = newGameParameters.numberOfCityStates
-        newGameOptionsTable.add(cityStatesSelectBox).pad(10f).row()
+        // Todo - re-enable this when city states are fit for players
+        //addCityStatesSelectBox(newGameOptionsTable)
+
 
         humanPlayers.addListener(object : ChangeListener() {
             override fun changed(event: ChangeEvent?, actor: Actor?) {
@@ -202,6 +198,16 @@ class NewGameScreen: PickerScreen(){
             }
         })
 
+    }
+
+    private fun addCityStatesSelectBox(newGameOptionsTable: Table) {
+        newGameOptionsTable.add("{Number of city states}:".tr())
+        val cityStatesSelectBox = SelectBox<Int>(skin)
+        val cityStatesArray = Array<Int>()
+        (0..GameBasics.Nations.filter { it.value.isCityState() }.size).forEach { cityStatesArray.add(it) }
+        cityStatesSelectBox.items = cityStatesArray
+        cityStatesSelectBox.selected = newGameParameters.numberOfCityStates
+        newGameOptionsTable.add(cityStatesSelectBox).pad(10f).row()
         cityStatesSelectBox.addListener(object : ChangeListener() {
             override fun changed(event: ChangeEvent?, actor: Actor?) {
                 newGameParameters.numberOfCityStates = cityStatesSelectBox.selected