mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-10 15:59:33 +07:00
Fixed policy branch finishers overriding branches - oops!
This commit is contained in:
@ -344,17 +344,20 @@ class Ruleset {
|
|||||||
if (policy.requires == null) {
|
if (policy.requires == null) {
|
||||||
policy.requires = arrayListOf(branch.name)
|
policy.requires = arrayListOf(branch.name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (policy != branch.policies.last()) {
|
||||||
|
// If mods override a previous policy's location, we don't want that policy to stick around,
|
||||||
|
// because it leads to softlocks on the policy picker screen
|
||||||
|
val conflictingLocationPolicy = policies.values.firstOrNull {
|
||||||
|
it.branch.name == policy.branch.name
|
||||||
|
&& it.column == policy.column
|
||||||
|
&& it.row == policy.row
|
||||||
|
}
|
||||||
|
if (conflictingLocationPolicy != null)
|
||||||
|
policies.remove(conflictingLocationPolicy.name)
|
||||||
|
}
|
||||||
policies[policy.name] = policy
|
policies[policy.name] = policy
|
||||||
|
|
||||||
// If mods override a previous policy's location, we don't want that policy to stick around,
|
|
||||||
// because it leads to softlocks on the policy picker screen
|
|
||||||
val conflictingLocationPolicy = policies.values.firstOrNull {
|
|
||||||
it.branch.name == policy.branch.name
|
|
||||||
&& it.column == policy.column
|
|
||||||
&& it.row == policy.row
|
|
||||||
}
|
|
||||||
if (conflictingLocationPolicy!=null)
|
|
||||||
policies.remove(conflictingLocationPolicy.name)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add a finisher
|
// Add a finisher
|
||||||
|
Reference in New Issue
Block a user