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

Fix shuffled item mode #735

Merged

Conversation

lahm86
Copy link
Collaborator

@lahm86 lahm86 commented Jul 31, 2024

Resolves #734.

Checklist

Description

This replaces #733 as a proper fix for shuffled item mode. We use a more standard approach of swapping locations rather than types so that indices match up with OG and so to prevent TRR NG+ changing the wrong things.

This change also means triggers under keys will be shifted and so it means it's more consistent with normal item rando. That itself fixes a potential softlock in Catacombs - consider picking up whatever is in the mask's place at the start, which triggers the flipmap, but then dropping down into the drained pool without picking up the mask.

The option for allowing keys under enemies is available too, and when it's off, if there isn't a suitable location for a key it won't be moved. We do this rather than moving the key to the enemy's position and nudging the enemy off it, because that relies on the player knowing the spawn points and still having to kill the enemy most likely. One instance (at least) where this isn't the case is the yellow key in Rig - there are only 2 potential locations for it, both under an enemy, so in that case we do nudge the enemy and leave the key in the original spot. If allow-enemy-keys is enabled, it will end up under the other enemy.

@lahm86 lahm86 added bug Something isn't working TRR labels Jul 31, 2024
@lahm86 lahm86 added this to the 1.9.2 milestone Jul 31, 2024
@lahm86 lahm86 self-assigned this Jul 31, 2024
@lahm86 lahm86 requested review from rr-, chreden and makotocchi July 31, 2024 20:53
@lahm86 lahm86 merged commit ba9961d into LostArtefacts:master Aug 1, 2024
2 checks passed
@lahm86 lahm86 deleted the issue-734-shuffled-items-rework branch August 3, 2024 08:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working TRR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix shuffled mode in NG+ (again)
2 participants