Externalize sector Loading Screens #1182
Merged
Conversation
This file contains 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
Many sectorrs are specifically mapped to loading screens. The list of screens and also the sector mapping are externalized to JSON files. Mods can add new loading screens for sectors.
No longer uses the LoadingScreenID enum, because it is not a complete list. We will now first look up mapping and use it, if any. If no mapping is found, we fall back to the rules in Loading_Screen.cc
|
I am still looking at the failed check but I don't understand why it happens. It is consistently crashing at the same test even when it is re-run. All tests work fine on the GitHub CI Linux and Mac builds, and also on my VC++ environment. |
ja2-derek
force-pushed
the
externalize-loading-screens
branch
from
b5268e8
to
77a27b8
Compare
Fixed. It is a unit test only problem. The ContentManager in tests tried to |
|
👍 . Thanks. |
ja2-derek
added
the
externalization
4 tasks
3 tasks
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.
At the high level, there are 2 ways to determine the loading screen for a sector:
DAYPALACE, A2 =>NIGHTCHITZENA)What's included
This PR externalizes part 1 of the loading screen logic. There are 2 kinds of data externalized:
LoadingScreenID), and points to a resource file (.STI)sector + night/daytoLoadingScreenIDWith this, mods can freely add new loading screens and then maps specific sectors to them. Though it is not possible to change the rules via JSON, the mods can resort to adding a mapping for every single sector.
Part of #665.