room: test sector range for Torso boss #1497
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
lahm86
requested review from
rr- and
walkawayy
and removed request for
a team
lahm86
force-pushed
the
issue-1236-extend-trigger-test
branch
from
6a5af96 to
cfc1448
Compare
rr-
reviewed
Sep 7, 2024
src/game/room.c
Outdated
| Room_GetSector(item->pos.x, MAX_HEIGHT, item->pos.z, &room_num); | ||
|
|
||
| Room_TestSectorTrigger(item, sector); | ||
| if (item->object_id == O_LARA || !g_GameFlow.use_extended_triggers) { |
There was a problem hiding this comment.
Thanks. Is the torso boss the only enemy for which this criterion is true? If so, we could just hardcode it to always trigger this behavior for it only, and skip the gameflow changes.
There was a problem hiding this comment.
Yes, good point. That'll be cleaner, I'll sort that out.
This provides an option to test a range of sectors around the one on which a large and heavy item dies. It ultimately resolves the potential softlock when killing Torso boss in Great Pyramid. Resolves LostArtefacts#1236.
lahm86
force-pushed
the
issue-1236-extend-trigger-test
branch
from
cfc1448 to
77dd140
Compare
lahm86
changed the title
rr-
approved these changes
Sep 7, 2024
|
I was able to lure the torso boss onto the starting trigger. This fix checks out. 👍 |
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.
Resolves #1236.
Checklist
Description
This provides an option to test a range of sectors around the one on which a large and heavy item dies. It ultimately resolves the potential softlock when killing Torso boss in Great Pyramid. For custom levels, it should be switched off in the gameflow as builders have full control of FD design (although it may have some uses, the freedom is there of course).
The only other solution to the softlock that I could see would involve item injection (a hidden boulder somewhere to trigger the camera/egg/music at the start) but this would break existing and TombATI saves, and I couldn't think of a way around that problem.
Other heavy trigger activators aren't affected here as they're all less than the 1.5 tile limit introduced here.
Just for testing - getting Adam to actually end up on the problematic tile is time-consuming, so attached is an exe that forces him here on death.
TR1X.zip