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 no longer trusts you on resource trades if you cut deals short

Browse Source
This commit is contained in:
yairm210 2024-05-27 17:55:09 +03:00
parent d7018de5c5
commit b9fd1c501a
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,6 +65,7 @@ enum class DiplomacyFlags {
WaryOf,
Bullied,
RecentlyAttacked,
ResourceTradesCutShort,
}
enum class DiplomaticModifiers(val text: String) {

2
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyTurnManager.kt
View File

@ -52,6 +52,8 @@ object DiplomacyTurnManager {
otherCiv().addNotification("One of our trades with [${civInfo.civName}] has been cut short",
DiplomacyAction(civInfo.civName, true),
NotificationCategory.Trade, NotificationIcon.Trade, civInfo.civName)
// If you cut a trade short, we're not going to trust you with per-turn trades for a while
otherCivDiplomacy().setFlag(DiplomacyFlags.ResourceTradesCutShort, civInfo.gameInfo.speed.dealDuration * 2)
civInfo.cache.updateCivResources()
}
}

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

@ -6,6 +6,7 @@ import com.unciv.logic.automation.ThreatLevel
import com.unciv.logic.automation.civilization.DiplomacyAutomation
import com.unciv.logic.city.City
import com.unciv.logic.civilization.Civilization
import com.unciv.logic.civilization.diplomacy.DiplomacyFlags
import com.unciv.logic.civilization.diplomacy.RelationshipLevel
import com.unciv.logic.map.tile.Tile
import com.unciv.models.ruleset.Ruleset
@ -115,6 +116,9 @@ class TradeEvaluation {
}
TradeType.Luxury_Resource -> {
if (civInfo.getDiplomacyManager(tradePartner).hasFlag(DiplomacyFlags.ResourceTradesCutShort))
return 0 // We don't trust you for resources
val weLoveTheKingPotential = civInfo.cities.count { it.demandedResource == offer.name } * 50
return if(!civInfo.hasResource(offer.name)) { // we can't trade on resources, so we are only interested in 1 copy for ourselves
weLoveTheKingPotential + when { // We're a lot more interested in luxury if low on happiness (AI is never low on happiness though)
@ -127,6 +131,9 @@ class TradeEvaluation {
}
TradeType.Strategic_Resource -> {
if (civInfo.getDiplomacyManager(tradePartner).hasFlag(DiplomacyFlags.ResourceTradesCutShort))
return 0 // We don't trust you for resources
val amountWillingToBuy = 2 - civInfo.getResourceAmount(offer.name)
if (amountWillingToBuy <= 0) return 0 // we already have enough.
val amountToBuyInOffer = min(amountWillingToBuy, offer.amount)