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

tr2/inject: add support for floor data injection #1921

Merged
merged 5 commits into from
Nov 18, 2024

Conversation

lahm86
Copy link
Collaborator

@lahm86 lahm86 commented Nov 18, 2024

Resolves #1744.
Resolves #1902.
Resolves #1920.

Checklist

  • I have read the coding conventions
  • I have added a changelog entry about what my pull request accomplishes, or it is an internal change

Description

This adds an injection framework similar to TR1, but is limited to floor data edits at the moment. We can build this up incrementally as needed. I've added three fixes for the time being as detailed in the linked issues. Floor data fixes are optional, just like TR1, and the config tool has been updated.

This currently supports reading basic bin files for TR2, no processing
is done yet.
This adds the same FD injection support as per TR1.
This fixes the duplicated trigger in room 44 for the collapsible tile
above.

Resolves LostArtefacts#1902.
This injects flipmap dummy triggers for the drawbridge in Tibetan
Foothills, plus the key trigger.

Resolves LostArtefacts#1744.
This injects the death sector property into six sectors that are
missing it in Temple of Xian room 91.

Resolves LostArtefacts#1920.
@lahm86 lahm86 added OG bug A bug in original game Feature New functionality Data Requires injecting content / files that are not a part of the original game TR2 labels Nov 18, 2024
@lahm86 lahm86 self-assigned this Nov 18, 2024
@lahm86 lahm86 requested review from a team as code owners November 18, 2024 20:11
@lahm86 lahm86 requested review from rr-, walkawayy and aredfan and removed request for a team November 18, 2024 20:11
Copy link

@lahm86
Copy link
Collaborator Author

lahm86 commented Nov 18, 2024

Copy link
Collaborator

@aredfan aredfan left a comment

Choose a reason for hiding this comment

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

The injection works nicely in all 3 cases, also thank you. 👍

Copy link
Collaborator

@rr- rr- left a comment

Choose a reason for hiding this comment

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

Fantastic. Thank you

@lahm86 lahm86 merged commit 4a7ec6d into LostArtefacts:develop Nov 18, 2024
6 checks passed
@lahm86 lahm86 deleted the initial-tr2-injection branch November 18, 2024 22:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Data Requires injecting content / files that are not a part of the original game Feature New functionality OG bug A bug in original game TR2
Projects
Archived in project
3 participants