Fix Civilopedia when opened for a religion-free ruleset without a loaded game #13241
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yairm210
reviewed
Apr 23, 2025
| return false | ||
| } | ||
| /** Overload of [isHiddenFromCivilopedia] for use in actually game-agnostic parts of Civilopedia */ | ||
| fun isHiddenFromCivilopedia(ruleset: Ruleset) = isHiddenFromCivilopedia(UncivGame.getGameInfoOrNull(), ruleset) | ||
|
|
||
| private fun gameAgnosticVisibleForReligionOrEspionage(hasFeature: Boolean, enabler: UniqueType, disabler: UniqueType): Boolean { |
There was a problem hiding this comment.
I have no idea what this is meant to do
There was a problem hiding this comment.
As I said in #13228 (comment), the but is still present and not really tied to the Easter days, though the easter eggs were the easiest way to show the regression - the regression from deprecating the hiden from civilopedia uniques and then not reimplementing them for the replacement uniques in the case Civilopedia is opened without a game loaded.
This does that.
Extra function because I implemented the missing no-game no-espionage check too while at it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #13228, including "search scope includes hidden objects".