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

Resolved #732 - don't change peace negotiation deals depending on how much you dislike the enemy

Browse Source
This commit is contained in:
Yair Morgenstern
2019-05-12 22:29:22 +03:00
parent a9a1962cec
commit c9bd56da95
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/logic/trade/TradeEvaluation.kt
View File

@ -17,9 +17,13 @@ class TradeEvaluation{
.filter { it.type!= TradeType.Treaty } // since treaties should only be evaluated once for 2 sides
.map { evaluateBuyCost(it,evaluator,tradePartner) }.sum()
val relationshipLevel = evaluator.getDiplomacyManager(tradePartner).relationshipLevel()
if(relationshipLevel==RelationshipLevel.Enemy) sumOfTheirOffers = (sumOfTheirOffers*1.5).toInt()
else if(relationshipLevel==RelationshipLevel.Unforgivable) sumOfTheirOffers *= 2
// If we're making a peace treaty, don't try to up the bargain for people you don't like.
// Leads to spartan behaviour where you demand more, the more you hate the enemy...unhelpful
if(trade.ourOffers.none { it.name==Constants.peaceTreaty }) {
val relationshipLevel = evaluator.getDiplomacyManager(tradePartner).relationshipLevel()
if (relationshipLevel == RelationshipLevel.Enemy) sumOfTheirOffers = (sumOfTheirOffers * 1.5).toInt()
else if (relationshipLevel == RelationshipLevel.Unforgivable) sumOfTheirOffers *= 2
}
val sumOfOurOffers = trade.ourOffers.map { evaluateSellCost(it, evaluator, tradePartner)}.sum()
return sumOfOurOffers <= sumOfTheirOffers