mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-10 15:59:33 +07:00
Better trade cancellation when all cities are offered (also includes player-to-player cases, not only AI)
This commit is contained in:
@ -12,6 +12,13 @@ import kotlin.math.sqrt
|
||||
class TradeEvaluation{
|
||||
|
||||
fun isTradeValid(trade:Trade, offerer:CivilizationInfo, tradePartner: CivilizationInfo): Boolean {
|
||||
|
||||
// Edge case time! Guess what happens if you offer a peace agreement to the AI for all their cities except for the capital,
|
||||
// and then capture their capital THAT SAME TURN? It can agree, leading to the civilization getting instantly destroyed!
|
||||
if (trade.ourOffers.count { it.type == TradeType.City } == offerer.cities.size
|
||||
|| trade.theirOffers.count { it.type == TradeType.City } == tradePartner.cities.size)
|
||||
return false
|
||||
|
||||
for (offer in trade.ourOffers)
|
||||
if (!isOfferValid(offer, offerer))
|
||||
return false
|
||||
@ -43,11 +50,6 @@ class TradeEvaluation{
|
||||
}
|
||||
|
||||
fun isTradeAcceptable(trade: Trade, evaluator: CivilizationInfo, tradePartner: CivilizationInfo): Boolean {
|
||||
// Edge case time! Guess what happens if you offer a peace agreement to the AI for all their cities except for the capital,
|
||||
// and then capture their capital THAT SAME TURN? It can agree, leading to the civilization getting instantly destroyed!
|
||||
if (trade.ourOffers.count { it.type == TradeType.City } == evaluator.cities.size)
|
||||
return false
|
||||
|
||||
var sumOfTheirOffers = trade.theirOffers.asSequence()
|
||||
.filter { it.type != TradeType.Treaty } // since treaties should only be evaluated once for 2 sides
|
||||
.map { evaluateBuyCost(it, evaluator, tradePartner) }.sum()
|
||||
|
Reference in New Issue
Block a user