AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed 'HiddenFromCivilopedia' targets

Browse Source
This commit is contained in:
Yair Morgenstern 2023-02-26 23:26:48 +02:00
parent 4ba822ca49
commit ec1b2b5077
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,9 @@ object UniqueTriggerActivation {
UniqueType.OneTimeFreeUnit -> {
val unitName = unique.params[0]
val unit = ruleSet.units[unitName]
if (chosenCity == null || unit == null || (unit.hasUnique(UniqueType.FoundCity) && civInfo.isOneCityChallenger()))
if (chosenCity == null
|| unit == null
|| unit.hasUnique(UniqueType.FoundCity) && civInfo.isOneCityChallenger())
return false
val placedUnit = civInfo.units.addUnit(unitName, chosenCity) ?: return false

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

@ -744,7 +744,9 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags:
HiddenAfterGreatProphet("Hidden after generating a Great Prophet", UniqueTarget.Ruins),
HiddenWithoutVictoryType("Hidden when [victoryType] Victory is disabled", UniqueTarget.Building, UniqueTarget.Unit, flags = UniqueFlag.setOfHiddenToUsers),
HiddenFromCivilopedia("Will not be displayed in Civilopedia", *UniqueTarget.values(), flags = UniqueFlag.setOfHiddenToUsers),
HiddenFromCivilopedia("Will not be displayed in Civilopedia", UniqueTarget.Building, UniqueTarget.Unit, UniqueTarget.Improvement,
UniqueTarget.Tech, UniqueTarget.Terrain, UniqueTarget.Resource, UniqueTarget.Policy, UniqueTarget.Promotion,
UniqueTarget.Nation, UniqueTarget.Ruins, flags = UniqueFlag.setOfHiddenToUsers),
// endregion