mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-06 17:18:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

AI focuses city-state gold gifting (#10836)

Browse Source 
* AI prioritises gifting gold to city-states with more influence invested

* AI only gives smaller city-state gold gifts if it already has influence

* AI prioritises gifting gold to city-states with the investment quest

* Only UseGoldAutomation includes valuing if the city-state has a quest
This commit is contained in:
Oskar Niesen 2023-12-30 12:49:57 -06:00 committed by GitHub
parent bd1a3d4d2a
commit 2768042700
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,7 +118,7 @@ object NextTurnAutomation {
civInfo.popupAlerts.clear() // AIs don't care about popups.
}
internal fun valueCityStateAlliance(civInfo: Civilization, cityState: Civilization): Int {
internal fun valueCityStateAlliance(civInfo: Civilization, cityState: Civilization, includeQuests: Boolean = false): Int {
var value = 0
if (civInfo.wantsToFocusOn(Victory.Focus.Culture) && cityState.cityStateFunctions.canProvideStat(Stat.Culture)) {
@ -150,8 +150,12 @@ object NextTurnAutomation {
if (!cityState.isAlive() || cityState.cities.isEmpty() || civInfo.cities.isEmpty())
return value
// The more we have invested into the city-state the more the alliance is worth
val ourInfluence = cityState.getDiplomacyManager(civInfo).getInfluence().toInt()
value += ourInfluence / 10
if (civInfo.gold < 100) {
if (civInfo.gold < 100 && ourInfluence < 30) {
// Consider bullying for cash
value -= 5
}
@ -159,7 +163,7 @@ object NextTurnAutomation {
if (cityState.getAllyCiv() != null && cityState.getAllyCiv() != civInfo.civName) {
// easier not to compete if a third civ has this locked down
val thirdCivInfluence = cityState.getDiplomacyManager(cityState.getAllyCiv()!!).getInfluence().toInt()
value -= (thirdCivInfluence - 60) / 10
value -= (thirdCivInfluence - 30) / 10
}
// Bonus for luxury resources we can get from them
@ -167,6 +171,11 @@ object NextTurnAutomation {
it.resource.resourceType == ResourceType.Luxury
&& it.resource !in civInfo.detailedCivResources.map { supply -> supply.resource }
}
if (includeQuests) {
// Investing is better if there is an investment bonus quest active.
value += (cityState.questManager.getInvestmentMultiplier(civInfo.civName) * 10).toInt() - 10
}
return value
}

10
core/src/com/unciv/logic/automation/civilization/UseGoldAutomation.kt
View File

@ -61,7 +61,7 @@ object UseGoldAutomation {
if (civ.gold < 250 || knownCityStates.none()) return
val cityState = knownCityStates
.filter { it.getAllyCiv() != civ.civName }
.associateWith { NextTurnAutomation.valueCityStateAlliance(civ, it) }
.associateWith { NextTurnAutomation.valueCityStateAlliance(civ, it, true) }
.maxByOrNull { it.value }?.takeIf { it.value > 0 }?.key
if (cityState != null) {
tryGainInfluence(civ, cityState)
@ -164,12 +164,14 @@ object UseGoldAutomation {
}
private fun tryGainInfluence(civInfo: Civilization, cityState: Civilization) {
if (civInfo.gold < 250) return // save up
if (cityState.getDiplomacyManager(civInfo).getInfluence() < 20) {
if (civInfo.gold < 250) return // Save up
if (cityState.getDiplomacyManager(civInfo).getInfluence() >= 20
&& civInfo.gold < 500) {
// Only make a small investment if we have a bit of influence already to build off of so we don't waste our money
cityState.cityStateFunctions.receiveGoldGift(civInfo, 250)
return
}
if (civInfo.gold < 500) return // it's not worth it to invest now, wait until you have enough for 2
if (civInfo.gold < 500) return // It's not worth it to invest now, wait until you have enough for 2
cityState.cityStateFunctions.receiveGoldGift(civInfo, 500)
return
}