From 8f231cd6e1e4e0fbcfa8b7ea0b98bc6426c76f8b Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 4 Jan 2020 22:09:49 +0200 Subject: [PATCH] Can now only start game in NewGamScreen with 2 or more players --- core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt | 5 +++++ core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt b/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt index b9bab60630..f2430fcfde 100644 --- a/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt +++ b/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt @@ -95,6 +95,11 @@ class NewGameScreen: PickerScreen(){ } } + fun setNewGameButtonEnabled(bool:Boolean){ + if(bool) rightSideButton.enable() + else rightSideButton.disable() + } + var newGame:GameInfo?=null diff --git a/core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt b/core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt index f2016573d2..6a51a4dd8d 100644 --- a/core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt +++ b/core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt @@ -10,10 +10,10 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextField import com.badlogic.gdx.utils.Align import com.unciv.UncivGame import com.unciv.logic.civilization.PlayerType -import com.unciv.models.ruleset.Ruleset -import com.unciv.models.translations.tr import com.unciv.models.metadata.GameParameters import com.unciv.models.metadata.Player +import com.unciv.models.ruleset.Ruleset +import com.unciv.models.translations.tr import com.unciv.ui.utils.* import com.unciv.ui.worldscreen.optionstable.PopupTable import java.util.* @@ -37,6 +37,7 @@ class PlayerPickerTable(val newGameScreen: NewGameScreen, val newGameParameters: playerListTable.add("+".toLabel(Color.BLACK,30).apply { this.setAlignment(Align.center) } .surroundWithCircle(50f).onClick { newGameParameters.players.add(Player()); update() }) } + newGameScreen.setNewGameButtonEnabled(newGameParameters.players.size>1) } fun getPlayerTable(player: Player, ruleset: Ruleset): Table {