mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-09 23:39:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

Treat all timed uniques as functioning as always true regardless of conditionals (#10940)

Browse Source 
* Treat all timed uniques as functioning as always true regardless of conditionals

* use replaceFirst instead of replace
This commit is contained in:
SeventhM
2024-01-19 02:05:28 -08:00
committed by GitHub
parent e5e86aa0d7
commit 940cda3009
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/models/ruleset/unique/Unique.kt
View File

@ -65,6 +65,8 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s
fun conditionalsApply(state: StateForConditionals = StateForConditionals()): Boolean { fun conditionalsApply(state: StateForConditionals = StateForConditionals()): Boolean {
if (state.ignoreConditionals) return true if (state.ignoreConditionals) return true
// Always allow Timed conditional uniques. They are managed elsewhere
if (conditionals.any{ it.isOfType(UniqueType.ConditionalTimedUnique) }) return true
for (condition in conditionals) { for (condition in conditionals) {
if (!conditionalApplies(condition, state)) return false if (!conditionalApplies(condition, state)) return false
} }
@ -478,7 +480,8 @@ class UniqueMap: HashMap<String, ArrayList<Unique>>() {
class TemporaryUnique() : IsPartOfGameInfoSerialization { class TemporaryUnique() : IsPartOfGameInfoSerialization {
constructor(uniqueObject: Unique, turns: Int) : this() { constructor(uniqueObject: Unique, turns: Int) : this() {
unique = uniqueObject.text val turnsText = uniqueObject.conditionals.first { it.isOfType(UniqueType.ConditionalTimedUnique) }.text
unique = uniqueObject.text.replaceFirst("<$turnsText>", "")
sourceObjectType = uniqueObject.sourceObjectType sourceObjectType = uniqueObject.sourceObjectType
sourceObjectName = uniqueObject.sourceObjectName sourceObjectName = uniqueObject.sourceObjectName
turnsLeft = turns turnsLeft = turns