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

Allow the "Civ destroyed" Notification to show a location (#10489)

Browse Source
This commit is contained in:
SomeTroglodyte 2023-11-13 21:13:37 +01:00 committed by GitHub
parent 8f1722498b
commit ec148309f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -580,11 +580,11 @@ object Battle {
return null
}
fun destroyIfDefeated(attackedCiv: Civilization, attacker: Civilization) {
fun destroyIfDefeated(attackedCiv: Civilization, attacker: Civilization, notificationLocation: Vector2? = null) {
if (attackedCiv.isDefeated()) {
if (attackedCiv.isCityState())
attackedCiv.cityStateFunctions.cityStateDestroyed(attacker)
attackedCiv.destroy()
attackedCiv.destroy(notificationLocation)
attacker.popupAlerts.add(PopupAlert(AlertType.Defeated, attackedCiv.civName))
}
}

2
core/src/com/unciv/logic/battle/Nuke.kt
View File

@ -218,7 +218,7 @@ object Nuke {
buildingModifier = city.getAggregateModifier(UniqueType.GarrisonDamageFromNukes)
doNukeExplosionDamageToCity(city, nukeStrength, damageModifierFromMissingResource)
Battle.postBattleNotifications(attacker, CityCombatant(city), city.getCenterTile())
Battle.destroyIfDefeated(city.civ, attacker.getCivInfo())
Battle.destroyIfDefeated(city.civ, attacker.getCivInfo(), city.location)
}
// Damage and/or destroy units on the tile

2
core/src/com/unciv/logic/city/managers/CityConquestFunctions.kt
View File

@ -90,7 +90,7 @@ class CityConquestFunctions(val city: City) {
city.moveToCiv(receivingCiv)
Battle.destroyIfDefeated(conqueredCiv, conqueringCiv)
Battle.destroyIfDefeated(conqueredCiv, conqueringCiv, city.location)
city.health = city.getMaxHealth() / 2 // I think that cities recover to half health when conquered?
if (city.population.population > 1)

21
core/src/com/unciv/logic/civilization/Civilization.kt
View File

@ -801,11 +801,24 @@ class Civilization : IsPartOfGameInfoSerialization {
newCity.cityConstructions.chooseNextConstruction()
}
fun destroy() {
/** Destroy what's left of a Civilization
*
* - function expects cities.isEmpty()
* - remaining units are destroyed and diplomacy cleaned up
* @param notificationLocation if given *and* the civ receiving the notification can see the tile or knows there was a city there, then the notification can show this location on click
*/
// At the moment, the "last unit down" callers do not pass a location, the city ones do - because the former isn't interesting
fun destroy(notificationLocation: Vector2? = null) {
val destructionText = if (isMajorCiv()) "The civilization of [$civName] has been destroyed!"
else "The City-State of [$civName] has been destroyed!"
for (civ in gameInfo.civilizations)
civ.addNotification(destructionText, NotificationCategory.General, civName, NotificationIcon.Death)
else "The City-State of [$civName] has been destroyed!"
for (civ in gameInfo.civilizations) {
if (civ.isDefeated()) continue // addNotification will ignore barbarians and other AI
val location = notificationLocation?.takeIf {
val tile = gameInfo.tileMap[notificationLocation]
tile.isVisible(civ) || tile.isExplored(civ) && tile.getShownImprovement(civ) == Constants.cityCenter
}
civ.addNotification(destructionText, LocationAction(location), NotificationCategory.General, civName, NotificationIcon.Death)
}
units.getCivUnits().forEach { it.destroy() }
tradeRequests.clear() // if we don't do this then there could be resources taken by "pending" trades forever
for (diplomacyManager in diplomacy.values) {

7
core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt
View File

@ -312,13 +312,14 @@ class CityStateFunctions(val civInfo: Civilization) {
return
otherCiv.addGold(-getDiplomaticMarriageCost())
val notificationLocation = civInfo.getCapital()!!.location
otherCiv.addNotification("We have married into the ruling family of [${civInfo.civName}], bringing them under our control.",
civInfo.getCapital()!!.location,
notificationLocation,
NotificationCategory.Diplomacy, civInfo.civName,
NotificationIcon.Diplomacy, otherCiv.civName)
for (civ in civInfo.gameInfo.civilizations.filter { it != otherCiv })
civ.addNotification("[${otherCiv.civName}] has married into the ruling family of [${civInfo.civName}], bringing them under their control.",
civInfo.getCapital()!!.location,
notificationLocation,
NotificationCategory.Diplomacy, civInfo.civName,
NotificationIcon.Diplomacy, otherCiv.civName)
for (unit in civInfo.units.getCivUnits())
@ -336,7 +337,7 @@ class CityStateFunctions(val civInfo: Civilization) {
city.moveToCiv(otherCiv)
city.isPuppet = true // Human players get a popup that allows them to annex instead
}
civInfo.destroy()
civInfo.destroy(notificationLocation)
}
fun getTributeWillingness(demandingCiv: Civilization, demandingWorker: Boolean = false): Int {