diff --git a/core/src/com/unciv/models/ruleset/unique/Conditionals.kt b/core/src/com/unciv/models/ruleset/unique/Conditionals.kt index c338eb3cc0..21228c2682 100644 --- a/core/src/com/unciv/models/ruleset/unique/Conditionals.kt +++ b/core/src/com/unciv/models/ruleset/unique/Conditionals.kt @@ -103,9 +103,6 @@ object Conditionals { } return when (conditional.type) { - // These are 'what to do' and not 'when to do' conditionals - UniqueType.ConditionalTimedUnique -> true - UniqueType.ConditionalChance -> stateBasedRandom.nextFloat() < conditional.params[0].toFloat() / 100f UniqueType.ConditionalEveryTurns -> checkOnGameInfo { turns % conditional.params[0].toInt() == 0 } UniqueType.ConditionalBeforeTurns, UniqueType.ConditionalBeforeTurnsOld -> checkOnGameInfo { turns < conditional.params[0].toInt() } diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt index b2d542d64f..aa611e60c5 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -654,8 +654,6 @@ enum class UniqueType( /////// general conditionals - ConditionalTimedUnique("for [amount] turns", UniqueTarget.Conditional, - docDescription = "Turns this unique into a trigger, activating this unique as a *global* unique for a number of turns"), ConditionalChance("with [amount]% chance", UniqueTarget.Conditional), ConditionalEveryTurns("every [positiveAmount] turns", UniqueTarget.Conditional), ConditionalBeforeTurns("before turn number [amount]", UniqueTarget.Conditional), @@ -895,6 +893,10 @@ enum class UniqueType( //endregion ///////////////////////////////////////////// region 90 META ///////////////////////////////////////////// + + ConditionalTimedUnique("for [amount] turns", UniqueTarget.MetaModifier, + docDescription = "Turns this unique into a trigger, activating this unique as a *global* unique for a number of turns"), + HiddenWithoutReligion("Hidden when religion is disabled", UniqueTarget.Unit, UniqueTarget.Building, UniqueTarget.Ruins, UniqueTarget.Tutorial, flags = UniqueFlag.setOfHiddenToUsers),