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

Lock overworld doors Randomizer option #4489

Merged
merged 1 commit into from
Jan 20, 2025

Conversation

garrettjoecox
Copy link
Contributor

@garrettjoecox garrettjoecox commented Oct 28, 2024

Most of this was done over 8 months ago, just recently updated to the latest develop-rando. I tested it pretty thoroughly back then, but haven't tested it a lot after updating it.

Todo:

  • French Hint & GetItem translations
  • Works with skeleton key
Screenshot 2024-09-12 at 10 36 11 PM Screenshot 2024-09-03 at 9 06 29 PM

Build Artifacts

@Pepper0ni
Copy link
Contributor

I want to give this a testing push to get it in soon, but need conflicts fixing

@SuperBro64
Copy link

After looking at the file changes, I noticed that two overworld doors seemingly weren't given keys, those being the back entrance of the Kakariko Potion Shop and the entrance to the Back Alley house where the bearded man wearing green lives.

Were there any logical-based reasons for not making keys for those doors? I can see there potentially being an issue with the Kakariko Potion Shop having both entrances locked (though I don't know for sure), but the only reason I can think of as to not locking the Back Alley house is because there are normally no checks in it.

If that is the reason, then it may be worth noting that the house does have three pots in it, so with potsanity being a realistic addition now (#4592), there will be gameplay significance to adding a lock to the door.

@garrettjoecox
Copy link
Contributor Author

the back entrance of the Kakariko Potion Shop and the entrance to the Back Alley house where the bearded man wearing green lives.

The back entrance of the Kakariko Potion shop shares the same key as the front entrance, if you unlock one it will unlock the other.

As for the alley house, you are correct, I hadn't locked it due to lack of checks or even a region, now that it exists I will add a lock & key.

@garrettjoecox
Copy link
Contributor Author

Rebased, fixed copy pasta of obscure hint, added alley house key. Good to go

Copy link
Contributor

@Malkierian Malkierian left a comment

Choose a reason for hiding this comment

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

Code looks good to me.

Copy link
Contributor

@Pepper0ni Pepper0ni left a comment

Choose a reason for hiding this comment

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

a couple of non-blocking things I found. I would also like an "out to in" only mode at some point, for QoL when playing with interior randomiser,

Copy link
Contributor

@Pepe20129 Pepe20129 left a comment

Choose a reason for hiding this comment

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

Just one small thing, but it can be done later.

soh/src/overlays/actors/ovl_player_actor/z_player.c Outdated Show resolved Hide resolved
@Pepe20129
Copy link
Contributor

Just noticed that the "Shops and Games always open" option removes locks when making the doors openable in the other daytime.

@garrettjoecox garrettjoecox force-pushed the lock-overworld-doors branch 2 times, most recently from e8b14a7 to b3ee62b Compare January 8, 2025 19:36
@garrettjoecox
Copy link
Contributor Author

Just noticed that the "Shops and Games always open" option removes locks when making the doors openable in the other daytime.

These can probably be made compatible with each other with some effort but for now I just left a note in the tooltip

@aMannus aMannus added this to the 9.0.0 milestone Jan 11, 2025
@garrettjoecox
Copy link
Contributor Author

Rebased again, and migrated to ShipInit

Copy link
Contributor

@aMannus aMannus left a comment

Choose a reason for hiding this comment

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

Couple minor things. Loving the ShipInit, can't wait to migrate more to similar patterns.

soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp Outdated Show resolved Hide resolved
soh/soh/Enhancements/randomizer/draw.cpp Show resolved Hide resolved
soh/soh/Enhancements/randomizer/option_descriptions.cpp Outdated Show resolved Hide resolved
soh/soh/SohMenuBar.cpp Outdated Show resolved Hide resolved
@SuperBro64
Copy link

Quick question before this gets merged at some point: Will the Item Tracker and/or Miscellaneous Collectibles Subscreen be updated to help the player keep track of which overworld keys they've collected? If not now, maybe at some point?

Otherwise, since the overworld doors at scattered across the world instead of inside a dungeon it probably wouldn't be too easy to keep track of which keys you have.

@aMannus
Copy link
Contributor

aMannus commented Jan 19, 2025

Quick question before this gets merged at some point: Will the Item Tracker and/or Miscellaneous Collectibles Subscreen be updated to help the player keep track of which overworld keys they've collected? If not now, maybe at some point?

Otherwise, since the overworld doors at scattered across the world instead of inside a dungeon it probably wouldn't be too easy to keep track of which keys you have.

Probably eventually if someone wants to pick it up.

@aMannus aMannus merged commit eab11d7 into HarbourMasters:develop Jan 20, 2025
5 checks passed
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.

6 participants