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

AI doesn't counter offer and request a defesive pact, open borders or research pact at the same time (#10823)

Browse Source 
* AI now does not offer a defensive pact/open border/research agreement if there is a pending counter offer with it

* Moved searching for a pending trade offer to a new function
This commit is contained in:
Oskar Niesen
2023-12-28 14:40:30 -06:00
committed by GitHub
parent f1bd13c80c
commit e823d82471
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,7 +97,10 @@ object DiplomacyAutomation {
.filter { it.isMajorCiv() && !civInfo.isAtWarWith(it)
&& it.hasUnique(UniqueType.EnablesOpenBorders)
&& !civInfo.getDiplomacyManager(it).hasOpenBorders
&& !civInfo.getDiplomacyManager(it).hasFlag(DiplomacyFlags.DeclinedOpenBorders) }
&& !civInfo.getDiplomacyManager(it).hasFlag(DiplomacyFlags.DeclinedOpenBorders)
&& !isTradeBeingOffered(civInfo, it, Constants.openBorders)
}
.sortedByDescending { it.getDiplomacyManager(civInfo).relationshipLevel() }.toList()
for (otherCiv in civsThatWeCanOpenBordersWith) {
// Default setting is 3, this will be changed according to different civ.
@ -134,6 +137,7 @@ object DiplomacyAutomation {
.filter {
civInfo.diplomacyFunctions.canSignResearchAgreementsWith(it)
&& !civInfo.getDiplomacyManager(it).hasFlag(DiplomacyFlags.DeclinedResearchAgreement)
&& !isTradeBeingOffered(civInfo, it, Constants.researchAgreement)
}
.sortedByDescending { it.stats.statsForNextTurn.science }
@ -157,6 +161,7 @@ object DiplomacyAutomation {
civInfo.diplomacyFunctions.canSignDefensivePactWith(it)
&& !civInfo.getDiplomacyManager(it).hasFlag(DiplomacyFlags.DeclinedDefensivePact)
&& civInfo.getDiplomacyManager(it).relationshipIgnoreAfraid() == RelationshipLevel.Ally
&& !isTradeBeingOffered(civInfo, it, Constants.defensivePact)
}
for (otherCiv in canSignDefensivePactCiv) {
@ -301,4 +306,10 @@ object DiplomacyAutomation {
}
}
private fun isTradeBeingOffered(civInfo: Civilization, otherCiv: Civilization, offerName:String): Boolean {
return civInfo.tradeRequests.filter { request -> request.requestingCiv == otherCiv.civName }
.any { trade -> trade.trade.ourOffers.any { offer -> offer.name == offerName }}
|| civInfo.tradeRequests.filter { request -> request.requestingCiv == otherCiv.civName }
.any { trade -> trade.trade.theirOffers.any { offer -> offer.name == offerName }}
}
}