Mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-20 19:56:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

AI: choose policy branch at random between those with the least remaining policies

Browse Source
This commit is contained in:
yairm210 2025-02-13 23:25:40 +02:00
parent 76320bdc44
commit 6d278bc2fe
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,26 +328,22 @@ object NextTurnAutomation {
// If incomplete branches have higher priorities than any newly adoptable branch, // If incomplete branches have higher priorities than any newly adoptable branch,
if (maxAdoptablePriority <= maxIncompletePriority) { if (maxAdoptablePriority <= maxIncompletePriority) {
// Prioritize finishing one of the unfinished branches // Prioritize finishing one of the unfinished branches
incompleteBranches.filter { incompleteBranches.filter { priorityMap[it] == maxIncompletePriority }.toSet()
priorityMap[it] == maxIncompletePriority
}.toSet()
} }
// If newly adoptable branches have higher priorities than any incomplete branch, // If newly adoptable branches have higher priorities than any incomplete branch,
else { else {
// Prioritize adopting one of the new branches // Prioritize adopting one of the new branches
adoptableBranches.filter { adoptableBranches.filter { priorityMap[it] == maxAdoptablePriority }.toSet()
priorityMap[it] == maxAdoptablePriority
}.toSet()
} }
// branchCompletionMap but keys are only candidates // branchCompletionMap but keys are only candidates
val candidateCompletionMap: Map<PolicyBranch, Int> = val candidateCompletionMap: Map<PolicyBranch, Int> =
civInfo.policies.branchCompletionMap.filterKeys { key -> civInfo.policies.branchCompletionMap.filterKeys { key -> key in candidates }
key in candidates
}
// Choose the branch with the LEAST REMAINING policies, not the MOST ADOPTED ones // Choose the branch with the LEAST REMAINING policies, not the MOST ADOPTED ones
val targetBranch = candidateCompletionMap.minBy { it.key.policies.size - it.value }.key val targetBranch = candidateCompletionMap.asIterable()
.groupBy { it.key.policies.size - it.value }
.minByOrNull { it.key }!!.value.random().key
val policyToAdopt: Policy = val policyToAdopt: Policy =
if (civInfo.policies.isAdoptable(targetBranch)) targetBranch if (civInfo.policies.isAdoptable(targetBranch)) targetBranch

2
desktop/src/com/unciv/app/desktop/UniqueDocsWriter.kt
View File

@ -42,7 +42,7 @@ class UniqueDocsWriter {
// by their UniqueTarget.ordinal as well - source code order. // by their UniqueTarget.ordinal as well - source code order.
val targetTypesToUniques: Map<UniqueTarget, List<UniqueType>> = val targetTypesToUniques: Map<UniqueTarget, List<UniqueType>> =
if (showUniqueOnOneTarget) if (showUniqueOnOneTarget)
UniqueType.entries.asSequence() UniqueType.entries
.groupBy { it.targetTypes.minOrNull()!! } .groupBy { it.targetTypes.minOrNull()!! }
.toSortedMap() .toSortedMap()
else else