AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-26 13:27:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Patch AlertPopup to correctly close when it cannot find a required asset (#11095)

Browse Source
This commit is contained in:
SomeTroglodyte 2024-02-08 20:33:25 +01:00 committed by GitHub
parent 4aba1c2751
commit 1ad8c69e60
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt
View File

@ -40,6 +40,10 @@ import java.util.EnumSet
* [Popup] communicating events other than trade offers to the player. * [Popup] communicating events other than trade offers to the player.
* (e.g. First Contact, Wonder built, Tech researched,...) * (e.g. First Contact, Wonder built, Tech researched,...)
* *
* **Opens itself at the end of instantiation!**
*
* (In rare cases, it chooses not to: Mods making a RecapturedCivilian not find the unit as it was illegal and removed after the actual capture)
*
* Called in [WorldScreen].update, which pulls them from viewingCiv.popupAlerts. * Called in [WorldScreen].update, which pulls them from viewingCiv.popupAlerts.
* *
* @param worldScreen The parent screen * @param worldScreen The parent screen
@ -73,6 +77,8 @@ class AlertPopup(
addCloseButton(text, KeyboardBinding.NextTurnAlternate, null) addCloseButton(text, KeyboardBinding.NextTurnAlternate, null)
init { init {
var skipThisAlert = false
// This makes the buttons fill up available width. See comments in #9559. // This makes the buttons fill up available width. See comments in #9559.
// To implement a middle ground, I would either simply replace growX() with minWidth(240f) or so, // To implement a middle ground, I would either simply replace growX() with minWidth(240f) or so,
// or replace the Popup.equalizeLastTwoButtonWidths() function with something intelligent not // or replace the Popup.equalizeLastTwoButtonWidths() function with something intelligent not
@ -95,9 +101,10 @@ class AlertPopup(
AlertType.StartIntro -> addStartIntro() AlertType.StartIntro -> addStartIntro()
AlertType.DiplomaticMarriage -> addDiplomaticMarriage() AlertType.DiplomaticMarriage -> addDiplomaticMarriage()
AlertType.BulliedProtectedMinor, AlertType.AttackedProtectedMinor -> addBulliedOrAttackedProtectedMinor() AlertType.BulliedProtectedMinor, AlertType.AttackedProtectedMinor -> addBulliedOrAttackedProtectedMinor()
AlertType.RecapturedCivilian -> addRecapturedCivilian() AlertType.RecapturedCivilian -> skipThisAlert = addRecapturedCivilian()
AlertType.GameHasBeenWon -> addGameHasBeenWon() AlertType.GameHasBeenWon -> addGameHasBeenWon()
} }
if (!skipThisAlert) open()
} }
//region AlertType handlers //region AlertType handlers
@ -279,14 +286,12 @@ class AlertPopup(
music.chooseTrack(viewingCiv.civName, MusicMood.Golden, MusicTrackChooserFlags.setSpecific) music.chooseTrack(viewingCiv.civName, MusicMood.Golden, MusicTrackChooserFlags.setSpecific)
} }
private fun addRecapturedCivilian() { /** @return true to skip opening this Popup, as we're running in the initialization phase before the Popup is open */
private fun addRecapturedCivilian(): Boolean {
val position = Vector2().fromString(popupAlert.value) val position = Vector2().fromString(popupAlert.value)
val tile = gameInfo.tileMap[position] val tile = gameInfo.tileMap[position]
val capturedUnit = tile.civilianUnit // This has got to be it val capturedUnit = tile.civilianUnit // This has got to be it
if (capturedUnit == null) { // the unit disappeared somehow? maybe a modded action? ?: return true // the unit disappeared somehow? maybe a modded action?
close()
return
}
val originalOwner = getCiv(capturedUnit.originalOwner!!) val originalOwner = getCiv(capturedUnit.originalOwner!!)
val captor = viewingCiv val captor = viewingCiv
@ -327,6 +332,7 @@ class AlertPopup(
// Take it for ourselves // Take it for ourselves
BattleUnitCapture.captureOrConvertToWorker(capturedUnit, captor) BattleUnitCapture.captureOrConvertToWorker(capturedUnit, captor)
} }
return false
} }
private fun addStartIntro() { private fun addStartIntro() {

2
core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt
View File

@ -421,7 +421,7 @@ class WorldScreen(
game.pushScreen(VictoryScreen(this)) game.pushScreen(VictoryScreen(this))
viewingCiv.greatPeople.freeGreatPeople > 0 -> viewingCiv.greatPeople.freeGreatPeople > 0 ->
game.pushScreen(GreatPersonPickerScreen(viewingCiv)) game.pushScreen(GreatPersonPickerScreen(viewingCiv))
viewingCiv.popupAlerts.any() -> AlertPopup(this, viewingCiv.popupAlerts.first()).open() viewingCiv.popupAlerts.any() -> AlertPopup(this, viewingCiv.popupAlerts.first())
viewingCiv.tradeRequests.isNotEmpty() -> { viewingCiv.tradeRequests.isNotEmpty() -> {
// In the meantime this became invalid, perhaps because we accepted previous trades // In the meantime this became invalid, perhaps because we accepted previous trades
for (tradeRequest in viewingCiv.tradeRequests.toList()) for (tradeRequest in viewingCiv.tradeRequests.toList())