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

Expand on TRR file control #679

Merged
merged 6 commits into from
May 21, 2024

Conversation

lahm86
Copy link
Collaborator

@lahm86 lahm86 commented May 20, 2024

Part of #614.

Checklist

Description

Some further progress in reading/writing TRR files. MAP and PDP are what we'll need for the most part for moving models around, so these are now part of the three combined level classes. Nothing uses these yet, this is just the groundwork. I've also added (local) tests for the TRR level files in case anything changes there.

The large alias enums are needed so we know after import how to map object IDs. That'll probably be managed in TRDataControl at some point. The string to enum maps are also needed to avoid us renaming TR1Type, TR2Type, TR3Type to match the names in the MAP files, as that would cause too many rewrites elsewhere.

Moving the additional files around is all handled by TRGE, just like the script and suchlike currently. TRG and TEX files are also backed up, but we don't currently use them (or rather know the format).

@lahm86 lahm86 added this to the 1.9.0 milestone May 20, 2024
@lahm86 lahm86 self-assigned this May 20, 2024
@lahm86 lahm86 requested review from rr-, chreden and makotocchi May 20, 2024 20:06
["PLAYER_2"] = TR3Type.CutsceneActor2,
["PLAYER_3"] = TR3Type.CutsceneActor3,
["PLAYER4"] = TR3Type.CutsceneActor4,
["PLAYER_4"] = TR3Type.CutsceneActor_4,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does this have _?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There seems to be a duplicate of sorts in the map files for TR3, with PLAYER4 and PLAYER_4. Because we need unique keys for the flipped version of the dictionary, I just added the new placeholder type. It's not something we'll be changing to be honest, it's mainly just to prove we can match everything up for the tests.

@lahm86 lahm86 merged commit 201d2e9 into LostArtefacts:master May 21, 2024
2 checks passed
@lahm86 lahm86 deleted the issue-614-trr-file-control branch May 21, 2024 08:20
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.

2 participants