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

Resolves #10599 - Cities you haven't bombarded with will auto-bombard at turn end

Browse Source
This commit is contained in:
Yair Morgenstern 2023-11-28 14:31:43 +02:00
parent e872f5ade4
commit 7162011d26
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,7 +352,7 @@ object NextTurnAutomation {
} }
} }
private fun automateCityBombardment(civInfo: Civilization) { fun automateCityBombardment(civInfo: Civilization) {
for (city in civInfo.cities) UnitAutomation.tryBombardEnemy(city) for (city in civInfo.cities) UnitAutomation.tryBombardEnemy(city)
} }

4
core/src/com/unciv/logic/civilization/managers/TurnManager.kt
View File

@ -31,7 +31,7 @@ class TurnManager(val civInfo: Civilization) {
fun startTurn(progressBar: NextTurnProgress? = null) { fun startTurn(progressBar: NextTurnProgress? = null) {
if (civInfo.isSpectator()) return if (civInfo.isSpectator()) return
civInfo.threatManager.clear() civInfo.threatManager.clear()
if (civInfo.isMajorCiv() && civInfo.isAlive()) { if (civInfo.isMajorCiv() && civInfo.isAlive()) {
civInfo.statsHistory.recordRankingStats(civInfo) civInfo.statsHistory.recordRankingStats(civInfo)
@ -225,6 +225,8 @@ class TurnManager(val civInfo: Civilization) {
fun endTurn(progressBar: NextTurnProgress? = null) { fun endTurn(progressBar: NextTurnProgress? = null) {
NextTurnAutomation.automateCityBombardment(civInfo) // Bombard with all cities that haven't, maybe you missed one
val notificationsLog = civInfo.notificationsLog val notificationsLog = civInfo.notificationsLog
val notificationsThisTurn = Civilization.NotificationsLog(civInfo.gameInfo.turns) val notificationsThisTurn = Civilization.NotificationsLog(civInfo.gameInfo.turns)
notificationsThisTurn.notifications.addAll(civInfo.notifications) notificationsThisTurn.notifications.addAll(civInfo.notifications)