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

Add <when espionage is enabled> conditional (#12326)

Browse Source 
* Modding: Replaced "Hidden when espionage is disabled" with "Only available <when espionage is enabled>"

* Modding: Fix unique deprecation notice

* Add ConditionalEspionageEnabled to isUnavailableBySettings list
This commit is contained in:
Rob Loach
2024-10-21 14:51:50 -04:00
committed by GitHub
parent dcfd2b7a70
commit e9481d4bc1
7 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,6 +142,8 @@ object Conditionals {
UniqueType.ConditionalVictoryDisabled -> checkOnGameInfo { !gameParameters.victoryTypes.contains(conditional.params[0]) }
UniqueType.ConditionalReligionEnabled -> checkOnGameInfo { isReligionEnabled() }
UniqueType.ConditionalReligionDisabled -> checkOnGameInfo { !isReligionEnabled() }
UniqueType.ConditionalEspionageEnabled -> checkOnGameInfo { isEspionageEnabled() }
UniqueType.ConditionalEspionageDisabled -> checkOnGameInfo { !isEspionageEnabled() }
UniqueType.ConditionalTech -> checkOnCiv { tech.isResearched(conditional.params[0]) }
UniqueType.ConditionalNoTech -> checkOnCiv { !tech.isResearched(conditional.params[0]) }
UniqueType.ConditionalWhileResearching -> checkOnCiv { tech.currentTechnologyName() == conditional.params[0] }

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

@ -102,6 +102,8 @@ interface IHasUniques : INamed {
UniqueType.ConditionalSpeed,
UniqueType.ConditionalReligionEnabled,
UniqueType.ConditionalReligionDisabled,
UniqueType.ConditionalEspionageEnabled,
UniqueType.ConditionalEspionageDisabled,
)
val stateForConditionals = StateForConditionals(gameInfo = gameInfo)

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

@ -663,7 +663,8 @@ enum class UniqueType(
ConditionalVictoryDisabled("when [victoryType] Victory is disabled", UniqueTarget.Conditional),
ConditionalReligionEnabled("when religion is enabled", UniqueTarget.Conditional),
ConditionalReligionDisabled("when religion is disabled", UniqueTarget.Conditional),
ConditionalEspionageEnabled("when espionage is enabled", UniqueTarget.Conditional),
ConditionalEspionageDisabled("when espionage is disabled", UniqueTarget.Conditional),
/////// general conditionals
ConditionalChance("with [amount]% chance", UniqueTarget.Conditional),
@ -948,6 +949,7 @@ enum class UniqueType(
UniqueTarget.Unit, UniqueTarget.Building, UniqueTarget.Ruins, UniqueTarget.Tutorial,
flags = UniqueFlag.setOfHiddenToUsers),
@Deprecated("As of 4.13.19", ReplaceWith("Only available <when espionage is enabled>"))
HiddenWithoutEspionage("Hidden when espionage is disabled", UniqueTarget.Building,
flags = UniqueFlag.setOfHiddenToUsers),