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

Fixed crash when diplomacy values change while ending the turn

Browse Source
This commit is contained in:
Yair Morgenstern 2020-03-03 21:45:39 +02:00
parent 163d4ad347
commit 86576e25ae
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -457,7 +457,7 @@ class CivilizationInfo {
goldenAges.endTurn(getHappiness())
getCivUnits().forEach { it.endTurn() }
diplomacy.values.forEach { it.nextTurn() }
diplomacy.values.toList().forEach { it.nextTurn() } // we copy the diplomacy values so if it changes in-loop we won't crash
updateAllyCivForCityState()
updateHasActiveGreatWall()
}

30
core/src/com/unciv/ui/EmpireOverviewScreen.kt
View File

@ -26,13 +26,13 @@ class EmpireOverviewScreen(private val viewingPlayer:CivilizationInfo) : CameraS
init {
onBackButtonClicked { UncivGame.Current.setWorldScreen() }
val closeButton = "×".toLabel(Color.BLACK,30).apply { this.setAlignment(Align.center) }
.surroundWithCircle(30f).apply { circle.color=Color.RED }
val closeButton = "×".toLabel(Color.BLACK, 30).apply { this.setAlignment(Align.center) }
.surroundWithCircle(50f).apply { circle.color = Color.RED.cpy().lerp(Color.BLACK, 0.1f) }
closeButton.onClick { UncivGame.Current.setWorldScreen() }
closeButton.y = stage.height - closeButton.height - 5
topTable.add(closeButton)
val setCityInfoButton = TextButton("Cities".tr(),skin)
val setCityInfoButton = TextButton("Cities".tr(), skin)
val setCities = {
centerTable.clear()
centerTable.add(getCityInfoTable())
@ -42,7 +42,7 @@ class EmpireOverviewScreen(private val viewingPlayer:CivilizationInfo) : CameraS
setCityInfoButton.onClick(setCities)
topTable.add(setCityInfoButton)
val setStatsInfoButton = TextButton("Stats".tr(),skin)
val setStatsInfoButton = TextButton("Stats".tr(), skin)
setStatsInfoButton.onClick {
game.settings.addCompletedTutorialTask("See your stats breakdown")
centerTable.clear()
@ -57,41 +57,41 @@ class EmpireOverviewScreen(private val viewingPlayer:CivilizationInfo) : CameraS
}
topTable.add(setStatsInfoButton)
val setCurrentTradesButton = TextButton("Trades".tr(),skin)
val setCurrentTradesButton = TextButton("Trades".tr(), skin)
setCurrentTradesButton.onClick {
centerTable.clear()
centerTable.add(ScrollPane(getTradesTable())).height(stage.height*0.8f) // so it doesn't cover the navigation buttons
centerTable.add(ScrollPane(getTradesTable())).height(stage.height * 0.8f) // so it doesn't cover the navigation buttons
centerTable.pack()
}
topTable.add(setCurrentTradesButton)
if(viewingPlayer.diplomacy.values.all { it.trades.isEmpty() })
if (viewingPlayer.diplomacy.values.all { it.trades.isEmpty() })
setCurrentTradesButton.disable()
val setUnitsButton = TextButton("Units".tr(),skin)
val setUnitsButton = TextButton("Units".tr(), skin)
setUnitsButton.onClick {
centerTable.clear()
centerTable.add(ScrollPane(getUnitTable())).height(stage.height*0.8f)
centerTable.add(ScrollPane(getUnitTable())).height(stage.height * 0.8f)
centerTable.pack()
}
topTable.add(setUnitsButton )
topTable.add(setUnitsButton)
val setDiplomacyButton = TextButton("Diplomacy".tr(),skin)
val setDiplomacyButton = TextButton("Diplomacy".tr(), skin)
setDiplomacyButton.onClick {
centerTable.clear()
centerTable.add(getDiplomacyGroup()).height(stage.height*0.8f)
centerTable.add(getDiplomacyGroup()).height(stage.height * 0.8f)
centerTable.pack()
}
topTable.add(setDiplomacyButton)
val setResourcesButton = TextButton("Resources".tr(),skin)
val setResourcesButton = TextButton("Resources".tr(), skin)
setResourcesButton.onClick {
centerTable.clear()
centerTable.add(ScrollPane(getResourcesTable())).size(stage.width*0.8f, stage.height*0.8f)
centerTable.add(ScrollPane(getResourcesTable())).size(stage.width * 0.8f, stage.height * 0.8f)
centerTable.pack()
}
topTable.add(setResourcesButton)
if(viewingPlayer.detailedCivResources.isEmpty())
if (viewingPlayer.detailedCivResources.isEmpty())
setResourcesButton.disable()
topTable.pack()

10
core/src/com/unciv/ui/cityscreen/SpecialistAllocationTable.kt
View File

@ -48,8 +48,9 @@ class SpecialistAllocationTable(val cityScreen: CityScreen): Table(CameraStageBa
private fun getAssignButton(assignedSpecialists: Int, maxSpecialists: Int, stat: Stat):Actor {
if (assignedSpecialists >= maxSpecialists || cityInfo.isPuppet) return Table()
val assignButton = "+".toLabel(Color.BLACK,24).apply { this.setAlignment(Align.center) }
.surroundWithCircle(30f).apply { circle.color= Color.GREEN }
val assignButton = "+".toLabel(Color.BLACK,24)
.apply { this.setAlignment(Align.center) }
.surroundWithCircle(30f).apply { circle.color= Color.GREEN.cpy().lerp(Color.BLACK,0.2f) }
assignButton.onClick {
cityInfo.population.specialists.add(stat, 1f)
cityInfo.cityStats.update()
@ -63,8 +64,9 @@ class SpecialistAllocationTable(val cityScreen: CityScreen): Table(CameraStageBa
private fun getUnassignButton(assignedSpecialists: Int, stat: Stat):Actor {
if (assignedSpecialists <= 0 || cityInfo.isPuppet) return Table()
val unassignButton = "-".toLabel(Color.BLACK,24).apply { this.setAlignment(Align.center) }
.surroundWithCircle(30f).apply { circle.color= Color.RED }
val unassignButton = "-".toLabel(Color.BLACK,24)
.apply { this.setAlignment(Align.center) }
.surroundWithCircle(30f).apply { circle.color= Color.RED.cpy().lerp(Color.BLACK,0.1f) }
unassignButton.onClick {
cityInfo.population.specialists.add(stat, -1f)
cityInfo.cityStats.update()