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

All trades are now cancelled when a civ is defeated

Browse Source
This commit is contained in:
Yair Morgenstern
2019-04-24 20:48:32 +03:00
parent bda375f441
commit c3a00a0f5e
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,9 +196,7 @@ class Battle(val gameInfo:GameInfo) {
if(city.cityConstructions.isBuilt("Palace")){
city.cityConstructions.removeBuilding("Palace")
if(enemyCiv.isDefeated()) {
for(civ in gameInfo.civilizations)
civ.addNotification("The civilization of [${enemyCiv.civName}] has been destroyed!", null, Color.RED)
enemyCiv.getCivUnits().forEach { it.destroy() }
enemyCiv.destroy()
attacker.getCivInfo().popupAlerts.add(PopupAlert(AlertType.Defeated,enemyCiv.civName))
}
else if(enemyCiv.cities.isNotEmpty()){

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

@ -508,5 +508,18 @@ class CivilizationInfo {
}
}
fun destroy(){
for(civ in gameInfo.civilizations)
civ.addNotification("The civilization of [$civName] has been destroyed!", null, Color.RED)
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){
diplomacyManager.trades.clear()
diplomacyManager.otherCiv().getDiplomacyManager(this).trades.clear()
for(tradeRequest in diplomacyManager.otherCiv().tradeRequests.filter { it.requestingCiv==civName })
diplomacyManager.otherCiv().tradeRequests.remove(tradeRequest) // it would be really weird to get a trade request from a dead civ
}
}
//endregion
}