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

Resolved #11829 - "after [amount] turns" -> "after turn number [amount]", "before [amount] turns" -> "before turn number [amount]"

Browse Source
This commit is contained in:
yairm210 2024-06-25 16:09:18 +03:00
parent 2093761e2d
commit 0a19cfb739
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -289,7 +289,7 @@ object Conditionals {
first, second -> first != second
}
UniqueType.ConditionalCountableGreaterThan ->
UniqueType.ConditionalCountableMoreThan, UniqueType.ConditionalCountableGreaterThan ->
compareCountables(condition.params[0], condition.params[1]) {
first, second -> first > second
}

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

@ -651,10 +651,10 @@ enum class UniqueType(
ConditionalChance("with [amount]% chance", UniqueTarget.Conditional),
ConditionalEveryTurns("every [positiveAmount] turns", UniqueTarget.Conditional),
ConditionalBeforeTurns("before turn number [amount]", UniqueTarget.Conditional),
@Deprecated("As of 4.11.18", ReplaceWith("before turn number [amount]"))
@Deprecated("As of 4.12.3", ReplaceWith("before turn number [amount]"))
ConditionalBeforeTurnsOld("before [amount] turns", UniqueTarget.Conditional),
ConditionalAfterTurns("after turn number [amount]", UniqueTarget.Conditional),
@Deprecated("As of 4.11.18", ReplaceWith("after turn number [amount]"))
@Deprecated("As of 4.12.3", ReplaceWith("after turn number [amount]"))
ConditionalAfterTurnsOld("after [amount] turns", UniqueTarget.Conditional),
ConditionalTutorialsEnabled("if tutorials are enabled", UniqueTarget.Conditional, flags = UniqueFlag.setOfHiddenToUsers), // Hidden as no translations needed for now
ConditionalTutorialCompleted("if tutorial [comment] is completed", UniqueTarget.Conditional, flags = UniqueFlag.setOfHiddenToUsers), // Hidden as no translations needed for now
@ -770,6 +770,8 @@ enum class UniqueType(
/////// countables conditionals
ConditionalCountableEqualTo("when number of [countable] is equal to [countable]", UniqueTarget.Conditional),
ConditionalCountableDifferentThan("when number of [countable] is different than [countable]", UniqueTarget.Conditional),
ConditionalCountableMoreThan("when number of [countable] is more than [countable]", UniqueTarget.Conditional),
@Deprecated("As of 4.12.3", ReplaceWith("when number of [countable] is more than [countable]"))
ConditionalCountableGreaterThan("when number of [countable] is greater than [countable]", UniqueTarget.Conditional),
ConditionalCountableLessThan("when number of [countable] is less than [countable]", UniqueTarget.Conditional),
ConditionalCountableBetween("when number of [countable] is between [countable] and [countable]", UniqueTarget.Conditional),

4
docs/Modders/uniques.md
View File

@ -2301,8 +2301,8 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
Applicable to: Conditional
??? example "<when number of [countable] is greater than [countable]>"
Example: "<when number of [1000] is greater than [1000]>"
??? example "<when number of [countable] is more than [countable]>"
Example: "<when number of [1000] is more than [1000]>"
Applicable to: Conditional