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

AI counteroffers will no longer contain items already offered by the player for 'double declaration of war' etc (#6940)

Browse Source
This commit is contained in:
Yair Morgenstern 2022-05-27 13:55:33 +03:00 committed by GitHub
parent 591c96b0c1
commit 62dc05ee5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/com/unciv/logic/automation/NextTurnAutomation.kt
View File

@ -129,7 +129,7 @@ object NextTurnAutomation {
val tradeLogic = TradeLogic(civInfo, otherCiv)
tradeLogic.currentTrade.set(tradeRequest.trade.reverse())
// What do they have that we would want???
// What do they have that we would want?
val potentialAsks = HashMap<TradeOffer, Int>()
val counterofferAsks = HashMap<TradeOffer, Int>()
val counterofferGifts = ArrayList<TradeOffer>()
@ -142,8 +142,10 @@ object NextTurnAutomation {
continue // For example resources gained by trade or CS
if (offer.type == TradeType.City)
continue // Players generally don't want to give up their cities, and they might misclick
if (offer.type == TradeType.Agreement && tradeLogic.currentTrade.theirOffers.contains(offer))
continue // So you don't get double offers of open borders etc.
if (tradeLogic.currentTrade.theirOffers.any { it.type == offer.type && it.name == offer.name })
continue // So you don't get double offers of open borders declarations of war etc.
val value = evaluation.evaluateBuyCost(offer, civInfo, otherCiv)
if (value > 0)
potentialAsks[offer] = value