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

Defensive pact notification fix (#10025)

Browse Source 
* Fixed Civ getting two notifications of canceling their defensive pact when attacking.

* Added Defensive Pact related warnings to the Declare War popup

* Improved the warning to not include Civs that are already at war with the aggressor

* Improved the warning to not include Civs that are already at war with the aggressor

* Added defensive pact related warning translations

* Refactored removeDefensivePacts

* DeclareWarButton text now uses arrayListOf<String> and changed the for loop to a while loop

* Extracted the DeclareWarButton text to a new method.
This commit is contained in:
Oskar Niesen 2023-09-05 11:01:45 -05:00 committed by GitHub
parent a4cc566a8a
commit eec3732c96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 59 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/assets/jsons/translations/template.properties
View File

@ -119,6 +119,9 @@ Peace =
Research Agreement =
Declare war =
Declare war on [civName]? =
[civName] will also join them in the war =
An unknown civilization will also join them in the war =
This will cancel your defensive pact with [civName] =
Go to on map =
Let's begin! =
[civName] has declared war on us! =

34
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
View File

@ -765,27 +765,29 @@ class DiplomacyManager() : IsPartOfGameInfoSerialization {
*/
private fun removeDefensivePacts() {
val civAtWarWith = otherCiv()
civInfo.diplomacy.values.filter { it.diplomaticStatus == DiplomaticStatus.DefensivePact }.forEach {
for (diploManager in civInfo.diplomacy.values) {
if (diploManager.diplomaticStatus != DiplomaticStatus.DefensivePact) continue
// We already removed the trades and we don't want to remove the flags yet.
if (it.otherCiv() != civAtWarWith) {
if (diploManager.otherCiv() != civAtWarWith) {
// Trades with defensive pact are now invalid
val defensivePactOffer = it.trades.firstOrNull { trade -> trade.ourOffers.any { offer -> offer.name == Constants.defensivePact } }
it.trades.remove(defensivePactOffer)
val theirDefensivePactOffer = it.otherCivDiplomacy().trades.firstOrNull { trade -> trade.ourOffers.any { offer -> offer.name == Constants.defensivePact } }
it.otherCivDiplomacy().trades.remove(theirDefensivePactOffer)
it.removeFlag(DiplomacyFlags.DefensivePact)
it.otherCivDiplomacy().removeFlag(DiplomacyFlags.DefensivePact)
it.diplomaticStatus = DiplomaticStatus.Peace
it.otherCivDiplomacy().diplomaticStatus = DiplomaticStatus.Peace
val defensivePactOffer = diploManager.trades
.firstOrNull { trade -> trade.ourOffers.any { offer -> offer.name == Constants.defensivePact } }
diploManager.trades.remove(defensivePactOffer)
val theirDefensivePactOffer = diploManager.otherCivDiplomacy().trades
.firstOrNull { trade -> trade.ourOffers.any { offer -> offer.name == Constants.defensivePact } }
diploManager.otherCivDiplomacy().trades.remove(theirDefensivePactOffer)
diploManager.removeFlag(DiplomacyFlags.DefensivePact)
diploManager.otherCivDiplomacy().removeFlag(DiplomacyFlags.DefensivePact)
diploManager.diplomaticStatus = DiplomaticStatus.Peace
diploManager.otherCivDiplomacy().diplomaticStatus = DiplomaticStatus.Peace
}
for (civ in getCommonKnownCivs().filter { civ -> civ.isMajorCiv() }) {
civ.addNotification("[${civInfo.civName}] canceled their Defensive Pact with [${it.otherCivName}]!",
NotificationCategory.Diplomacy, civInfo.civName, NotificationIcon.Diplomacy, it.otherCivName)
civ.addNotification("[${civInfo.civName}] canceled their Defensive Pact with [${diploManager.otherCivName}]!",
NotificationCategory.Diplomacy, civInfo.civName, NotificationIcon.Diplomacy, diploManager.otherCivName)
}
civInfo.addNotification("We have canceled our Defensive Pact with [${it.otherCivName}]!",
NotificationCategory.Diplomacy, NotificationIcon.Diplomacy, it.otherCivName)
it.otherCiv().addNotification("[${civInfo.civName}] has canceled our Defensive Pact with us!",
NotificationCategory.Diplomacy, civInfo.civName, NotificationIcon.Diplomacy)
civInfo.addNotification("We have canceled our Defensive Pact with [${diploManager.otherCivName}]!",
NotificationCategory.Diplomacy, NotificationIcon.Diplomacy, diploManager.otherCivName)
}
}

39
core/src/com/unciv/ui/screens/diplomacyscreen/DiplomacyScreen.kt
View File

@ -873,7 +873,7 @@ class DiplomacyScreen(
declareWarButton.setText(declareWarButton.text.toString() + " ($turnsToPeaceTreaty${Fonts.turn})")
}
declareWarButton.onClick {
ConfirmPopup(this, "Declare war on [${otherCiv.civName}]?", "Declare war") {
ConfirmPopup(this, getDeclareWarButtonText(otherCiv), "Declare war") {
diplomacyManager.declareWar()
setRightSideFlavorText(otherCiv, otherCiv.nation.attacked, "Very well.")
updateLeftSideTable(otherCiv)
@ -883,6 +883,43 @@ class DiplomacyScreen(
if (isNotPlayersTurn()) declareWarButton.disable()
return declareWarButton
}
private fun getDeclareWarButtonText(otherCiv: Civilization): String {
val messageLines = arrayListOf<String>()
messageLines += "Declare war on [${otherCiv.civName}]?"
// Tell the player who all will join the other side from defensive pacts
val otherCivDefensivePactList = otherCiv.diplomacy.values.filter {
otherCivDiploManager -> otherCivDiploManager.otherCiv() != viewingCiv
&& otherCivDiploManager.diplomaticStatus == DiplomaticStatus.DefensivePact
&& !otherCivDiploManager.otherCiv().isAtWarWith(viewingCiv) }
.map { it.otherCiv() }.toMutableList()
// Go through and find all of the defensive pact chains and add them to the list
var listIndex = 0
while (listIndex < otherCivDefensivePactList.size) {
messageLines += if (viewingCiv.knows(otherCivDefensivePactList[listIndex]))
"[${otherCivDefensivePactList[listIndex].civName}] will also join them in the war"
else "An unknown civilization will also join them in the war"
// Add their defensive pact allies
otherCivDefensivePactList.addAll(otherCivDefensivePactList[listIndex].diplomacy.values
.filter { diploChain -> diploChain.diplomaticStatus == DiplomaticStatus.DefensivePact
&& !otherCivDefensivePactList.contains(diploChain.otherCiv())
&& diploChain.otherCiv() != viewingCiv && diploChain.otherCiv() != otherCiv
&& !diploChain.otherCiv().isAtWarWith(viewingCiv) }
.map { it.otherCiv() })
listIndex++
}
// Tell the player that their defensive pacts will be canceled.
for (civDiploManager in viewingCiv.diplomacy.values) {
if (civDiploManager.otherCiv() != otherCiv
&& civDiploManager.diplomaticStatus == DiplomaticStatus.DefensivePact
&& !otherCivDefensivePactList.contains(civDiploManager.otherCiv())) {
messageLines += "This will cancel your defensive pact with [${civDiploManager.otherCivName}]"
}
}
return messageLines.joinToString("\n") { "{$it}" }
}
//endregion