mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-07 17:43:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

"Timed unique" is definitely a meta-modifier and not a conditional

Browse Source
This commit is contained in:
yairm210 2024-08-10 23:34:09 +03:00
parent 7ad86f80d1
commit 6e57a02f8f
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/models/ruleset/unique/Conditionals.kt
View File

@ -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() }

6
core/src/com/unciv/models/ruleset/unique/UniqueType.kt
View File

@ -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),