mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-05 21:11:35 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix promotions being unavailable when it can be reached a slower way (#9856)

Browse Source 
Previously if a promotion could require 2 promotions from branch A but 1 branch B and the branch B also lead to an earlier promotion from branch A, it erroneously consider that a loop. Solved by copying the logic from the ruleset Validator (going child up to parent, rather than parent to child and passing in the hashset rather than using a global one)
This commit is contained in:
SeventhM 2023-08-08 23:17:09 -07:00 committed by GitHub
parent 036c6c820e
commit 0fbe5a18b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/com/unciv/ui/screens/pickerscreens/PromotionTree.kt
View File

@ -89,9 +89,9 @@ internal class PromotionTree(val unit: MapUnit) {
// Fill parent/child relations, ignoring prerequisites not in possiblePromotions
for (node in nodes.values) {
if (detectLoop(node)) continue
for (prerequisite in node.promotion.prerequisites) {
val parent = nodes[prerequisite] ?: continue
if (detectLoop(node, parent)) continue
node.parents += parent
parent.children += node
if (node.level > 0 && node.baseName == parent.baseName)
@ -150,20 +150,18 @@ internal class PromotionTree(val unit: MapUnit) {
fun allNodes() = nodes.values.asSequence()
fun allRoots() = allNodes().filter { it.isRoot }
private fun detectLoop(node: PromotionNode, parent: PromotionNode): Boolean {
if (parent == node) return true
private fun detectLoop(node: PromotionNode): Boolean {
val loopCheck = HashSet<PromotionNode>(nodes.size)
loopCheck.add(node)
fun detectRecursive(parent: PromotionNode, level: Int): Boolean {
fun detectRecursive(node: PromotionNode, level: Int, loopCheck: HashSet<PromotionNode>): Boolean {
if (level > 99) return true
if (parent in loopCheck) return true
loopCheck.add(parent)
for (child in parent.children) {
if (detectRecursive(child, level + 1)) return true
if (node in loopCheck) return true
loopCheck.add(node)
for (parent in node.parents) {
if (detectRecursive(parent, level + 1, loopCheck)) return true
}
return false
}
return detectRecursive(parent, 0)
return detectRecursive(node, 0, loopCheck)
}
private fun getReachableNode(promotion: Promotion): PromotionNode? =