AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-25 21:03:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve AI belief picking (#7369)

Browse Source 
* Improve AI belief picking

* Change default gameTimeScalingPercent to 100

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
This commit is contained in:
OptimizedForDensity 2022-07-08 08:49:35 -04:00 committed by GitHub
parent 33237d5a59
commit 7c64015aed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
core/src/com/unciv/logic/automation/ChooseBeliefsAutomation.kt
View File

@ -2,6 +2,7 @@ package com.unciv.logic.automation
import com.unciv.logic.city.CityInfo import com.unciv.logic.city.CityInfo
import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.civilization.ReligionState
import com.unciv.logic.map.TileInfo import com.unciv.logic.map.TileInfo
import com.unciv.models.ruleset.Belief import com.unciv.models.ruleset.Belief
import com.unciv.models.ruleset.BeliefType import com.unciv.models.ruleset.BeliefType
@ -112,15 +113,35 @@ object ChooseBeliefsAutomation {
private fun beliefBonusForPlayer(civInfo: CivilizationInfo, belief: Belief): Float { private fun beliefBonusForPlayer(civInfo: CivilizationInfo, belief: Belief): Float {
var score = 0f var score = 0f
val amountOfEnhancedReligions = civInfo.religionManager.amountOfFoundableReligions() val numberOfFoundedReligions = civInfo.gameInfo.civilizations.count {
it.religionManager.religion != null && it.religionManager.religionState >= ReligionState.Religion
}
val maxNumberOfReligions = numberOfFoundedReligions + civInfo.religionManager.remainingFoundableReligions()
// adjusts scores of certain beliefs as game evolves (adapted from Civ 5 DLL files on AI belief selection)
// enable differentiation of early vs late founding of religion and early vs late enhancement of religion
// this is mainly for mods which may shuffle enhancer and founder beliefs w.r.t. base UnCiv
var gameTimeScalingPercent = 100
when (civInfo.religionManager.religionState) {
ReligionState.FoundingReligion -> {
gameTimeScalingPercent = 100 - ((numberOfFoundedReligions * 100) / maxNumberOfReligions)
}
ReligionState.EnhancingReligion -> {
val amountOfEnhancedReligions = civInfo.gameInfo.civilizations.count {
it.religionManager.religion != null && it.religionManager.religionState == ReligionState.EnhancedReligion
}
gameTimeScalingPercent = 100 - ((amountOfEnhancedReligions * 100) / maxNumberOfReligions)
}
else -> {} // pantheon shouldn't matter
}
val goodEarlyModifier = when { val goodEarlyModifier = when {
amountOfEnhancedReligions < 33 -> 1f gameTimeScalingPercent < 33 -> 1f
amountOfEnhancedReligions < 66 -> 2f gameTimeScalingPercent < 66 -> 2f
else -> 4f else -> 4f
} }
val goodLateModifier = when { val goodLateModifier = when {
amountOfEnhancedReligions < 33 -> 2f gameTimeScalingPercent < 33 -> 2f
amountOfEnhancedReligions < 66 -> 1f gameTimeScalingPercent < 66 -> 1f
else -> 1/2f else -> 1/2f
} }
@ -153,27 +174,32 @@ object ChooseBeliefsAutomation {
UniqueType.BuyUnitsByProductionCost -> UniqueType.BuyUnitsByProductionCost ->
15f * if (civInfo.wantsToFocusOn(Victory.Focus.Military)) 2f else 1f 15f * if (civInfo.wantsToFocusOn(Victory.Focus.Military)) 2f else 1f
UniqueType.StatsWhenSpreading -> UniqueType.StatsWhenSpreading ->
unique.params[0].toInt() / 5f unique.params[0].toFloat() / 5f
UniqueType.StatsWhenAdoptingReligion, UniqueType.StatsWhenAdoptingReligionSpeed -> UniqueType.StatsWhenAdoptingReligion, UniqueType.StatsWhenAdoptingReligionSpeed ->
unique.stats.values.sum() / 50f unique.stats.values.sum() / 50f
UniqueType.RestingPointOfCityStatesFollowingReligionChange -> UniqueType.RestingPointOfCityStatesFollowingReligionChange ->
unique.params[0].toInt() / 7f if (civInfo.wantsToFocusOn(Victory.Focus.CityStates))
unique.params[0].toFloat() / 3.5f
else
unique.params[0].toFloat() / 7f
UniqueType.StatsFromGlobalCitiesFollowingReligion -> UniqueType.StatsFromGlobalCitiesFollowingReligion ->
50f / unique.stats.values.sum() unique.stats.values.sum()
UniqueType.StatsFromGlobalFollowers ->
4f * (unique.stats.values.sum() / unique.params[1].toFloat())
UniqueType.StatsSpendingGreatPeople -> UniqueType.StatsSpendingGreatPeople ->
unique.stats.values.sum() / 2f unique.stats.values.sum() / 2f
UniqueType.Strength -> UniqueType.Strength ->
unique.params[0].toInt() / 4f unique.params[0].toFloat() / 4f
UniqueType.ReligionSpreadDistance -> UniqueType.ReligionSpreadDistance ->
(10 + unique.params[0].toInt()) / goodEarlyModifier (10f + unique.params[0].toFloat()) * goodEarlyModifier
UniqueType.NaturalReligionSpreadStrength -> UniqueType.NaturalReligionSpreadStrength ->
(10 + unique.params[0].toInt()) / goodEarlyModifier unique.params[0].toFloat() * goodEarlyModifier / 5f
UniqueType.SpreadReligionStrength -> UniqueType.SpreadReligionStrength ->
unique.params[0].toInt() / goodLateModifier unique.params[0].toFloat() * goodLateModifier / 5f
UniqueType.FaithCostOfGreatProphetChange -> UniqueType.FaithCostOfGreatProphetChange ->
unique.params[0].toInt() / goodLateModifier / 2f -unique.params[0].toFloat() * goodLateModifier / 2f
UniqueType.BuyBuildingsDiscount, UniqueType.BuyItemsDiscount, UniqueType.BuyUnitsDiscount -> UniqueType.BuyBuildingsDiscount, UniqueType.BuyItemsDiscount, UniqueType.BuyUnitsDiscount ->
unique.params[2].toInt() / goodLateModifier -unique.params[2].toFloat() * goodLateModifier / 5f
else -> 0f else -> 0f
} }
} }

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

@ -540,6 +540,7 @@ object NextTurnAutomation {
} }
private fun enhanceReligion(civInfo: CivilizationInfo) { private fun enhanceReligion(civInfo: CivilizationInfo) {
if (civInfo.religionManager.religionState != ReligionState.EnhancingReligion) return
civInfo.religionManager.chooseBeliefs( civInfo.religionManager.chooseBeliefs(
null, null,
null, null,

4
core/src/com/unciv/logic/civilization/ReligionManager.kt
View File

@ -150,8 +150,6 @@ class ReligionManager : IsPartOfGameInfoSerialization {
} }
} }
fun amountOfFoundableReligions() = civInfo.gameInfo.civilizations.count { it.isMajorCiv() } / 2 + 1
fun remainingFoundableReligions(): Int { fun remainingFoundableReligions(): Int {
val foundedReligionsCount = civInfo.gameInfo.civilizations.count { val foundedReligionsCount = civInfo.gameInfo.civilizations.count {
it.religionManager.religion != null && it.religionManager.religionState >= ReligionState.Religion it.religionManager.religion != null && it.religionManager.religionState >= ReligionState.Religion
@ -159,7 +157,7 @@ class ReligionManager : IsPartOfGameInfoSerialization {
// count the number of foundable religions left given defined ruleset religions and number of civs in game // count the number of foundable religions left given defined ruleset religions and number of civs in game
val maxNumberOfAdditionalReligions = min(civInfo.gameInfo.ruleSet.religions.size, val maxNumberOfAdditionalReligions = min(civInfo.gameInfo.ruleSet.religions.size,
amountOfFoundableReligions()) - foundedReligionsCount civInfo.gameInfo.civilizations.count { it.isMajorCiv() } / 2 + 1) - foundedReligionsCount
val availableBeliefsToFound = min( val availableBeliefsToFound = min(
civInfo.gameInfo.ruleSet.beliefs.values.count { civInfo.gameInfo.ruleSet.beliefs.values.count {