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

Scenario now no longer spawns starting units - they should be prebuilt into the scenario!

Browse Source
This commit is contained in:
Yair Morgenstern
2020-08-10 21:18:55 +03:00
parent 8dd8fa3575
commit fd211b1fa3
2 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/GameStarter.kt
View File

@ -35,6 +35,7 @@ object GameStarter {
for(unit in tile.getUnits()) for(unit in tile.getUnits())
if(gameInfo.civilizations.none { it.civName== unit.owner}){ if(gameInfo.civilizations.none { it.civName== unit.owner}){
unit.currentTile=tile unit.currentTile=tile
unit.setTransients(ruleset)
unit.removeFromTile() unit.removeFromTile()
} }
@ -67,6 +68,7 @@ object GameStarter {
} }
// and only now do we add units for everyone, because otherwise both the gameInfo.setTransients() and the placeUnit will both add the unit to the civ's unit list! // and only now do we add units for everyone, because otherwise both the gameInfo.setTransients() and the placeUnit will both add the unit to the civ's unit list!
if (gameSetupInfo.mapParameters.type != MapType.scenario)
addCivStartingUnits(gameInfo) addCivStartingUnits(gameInfo)
return gameInfo return gameInfo

31
core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt
View File

@ -96,6 +96,19 @@ class NewGameScreen(previousScreen:CameraStageBaseScreen, _gameSetupInfo: GameSe
private fun newGameThread() { private fun newGameThread() {
try { try {
newGame = GameStarter.startNewGame(gameSetupInfo) newGame = GameStarter.startNewGame(gameSetupInfo)
} catch (exception: Exception) {
Gdx.app.postRunnable {
val cantMakeThatMapPopup = Popup(this)
cantMakeThatMapPopup.addGoodSizedLabel("It looks like we can't make a map with the parameters you requested!".tr()).row()
cantMakeThatMapPopup.addGoodSizedLabel("Maybe you put too many players into too small a map?".tr()).row()
cantMakeThatMapPopup.addCloseButton()
cantMakeThatMapPopup.open()
Gdx.input.inputProcessor = stage
rightSideButton.enable()
rightSideButton.setText("Start game!".tr())
}
}
if (gameSetupInfo.gameParameters.isOnlineMultiplayer) { if (gameSetupInfo.gameParameters.isOnlineMultiplayer) {
newGame!!.isUpToDate = true // So we don't try to download it from dropbox the second after we upload it - the file is not yet ready for loading! newGame!!.isUpToDate = true // So we don't try to download it from dropbox the second after we upload it - the file is not yet ready for loading!
try { try {
@ -118,26 +131,10 @@ class NewGameScreen(previousScreen:CameraStageBaseScreen, _gameSetupInfo: GameSe
newGame = null newGame = null
} }
} }
} catch (exception: Exception) {
Gdx.app.postRunnable {
val cantMakeThatMapPopup = Popup(this)
cantMakeThatMapPopup.addGoodSizedLabel("It looks like we can't make a map with the parameters you requested!".tr()).row()
cantMakeThatMapPopup.addGoodSizedLabel("Maybe you put too many players into too small a map?".tr()).row()
cantMakeThatMapPopup.addCloseButton()
cantMakeThatMapPopup.open()
Gdx.input.inputProcessor = stage
rightSideButton.enable()
rightSideButton.setText("Start game!".tr())
}
}
Gdx.graphics.requestRendering() Gdx.graphics.requestRendering()
} }
// fun setNewGameButtonEnabled(bool: Boolean) {
// if (bool) rightSideButton.enable()
// else rightSideButton.disable()
// }
fun lockTables() { fun lockTables() {
playerPickerTable.locked = true playerPickerTable.locked = true
newGameOptionsTable.locked = true newGameOptionsTable.locked = true