Spawn Neera a step earlier in SoA and tie the intro to her availability.#185
Merged
K4thos merged 2 commits intoGibberlings3:masterfrom Jan 28, 2026
Merged
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
In the current tip of EET, Neera's SoA intro scene involves a race condition - both Neera's spawn and the initiating cutscene happens when
OHN_INTRO_SCENEis on 2. In addition, if Neera is dead or otherwise unavailable, the cutscene still happens without her which can lead to a softlock when it reaches to her intervention.This PR resolves both issues:
OHN_INTRO_SCENEreaches 1, so anytime after the peasants acknowledge the murders. Neera's spawning is also moved from AR0500.BCS into OHNMCUT1.BCS and expanded with the same counter-popup validation as every other actor of the cutscene.Pinging @Argent77 for interest - I added the HasDLC checks to the Neera blocks, so Convenient EE NPCs should be unaffected by this change.
Fixes #157.