Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Organise SFX data hierarchically #620

Merged
merged 9 commits into from
Apr 20, 2024

Conversation

lahm86
Copy link
Collaborator

@lahm86 lahm86 commented Apr 19, 2024

Part of #619.

Checklist

Description

This squashes SFX data into one structure in TR1-3 and removes the complication of ensuring details are sorted/configured correctly before writing. TR4/5 remain as they were for now, these classes in general will be updated soon to hide the compression details and make things easier (too complicated as part of this PR, plus we don't randomize anything there yet).

This causes one side effect temporarily - cross-level enemies will be imported without any sound. The reason being model transport - although now setup to deal with the new SortedDictionary, and in a much simpler way than before - doesn't have updated data files as of yet (e.g. everything in TRRandomizerCore/Resources/TR1/Models remains without the exported new information). This won't be going live until after the next stage, which will be handling models, animations, etc. Once that's done, I am planning a new data structure overall to reduce our footprint a little more.

The first commit here contains the bulk of the new code, mainly big SFX enums, so might be easier to review commit-by-commit.

@lahm86 lahm86 added this to the 1.9.0 milestone Apr 19, 2024
@lahm86 lahm86 self-assigned this Apr 19, 2024
@lahm86 lahm86 requested review from rr-, chreden and makotocchi April 19, 2024 14:26
SFXExport/Program.cs Outdated Show resolved Hide resolved
lahm86 added 8 commits April 20, 2024 20:40
This currently means imported cross-level objects are silent.
TR3SoundDetails renamed to 4. 4/5 in general will undergo a big rewrite to hide compression implementation details, as too complex to merge currently.
@lahm86 lahm86 force-pushed the issue-619-sfx-reorg branch from e8af6f8 to 06b80d5 Compare April 20, 2024 19:43
@lahm86 lahm86 merged commit 5a3e7be into LostArtefacts:master Apr 20, 2024
2 checks passed
@lahm86 lahm86 deleted the issue-619-sfx-reorg branch April 20, 2024 19:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants