Skip to content

Conversation

@garrettjoecox
Copy link
Contributor

@garrettjoecox garrettjoecox commented Dec 14, 2022

Succeeds work done in #1468

Todo:

  • Disable item shuffle options when this is selected

Build Artifacts

@garrettjoecox garrettjoecox added the do not merge Not ready or not valid changes label Dec 14, 2022
@aMannus
Copy link
Contributor

aMannus commented Dec 14, 2022

This might be something for the future as I can imagine it'd take more work, but I'd really like to see this setting visually disabling the settings it supercedes in our UI.

@garrettjoecox
Copy link
Contributor Author

garrettjoecox commented Dec 14, 2022

This might be something for the future as I can imagine it'd take more work, but I'd really like to see this setting visually disabling the settings it supercedes in our UI.

I'd like that to happen in this PR I think, and if not, then some sort of large disclaimer near where it is selected that item shuffling won't work.

@Archez
Copy link
Contributor

Archez commented Dec 14, 2022

I'd like that to happen in this PR I think, and if not, then some sort of large disclaimer near where it is selected that item shuffling won't work.

Yeah, maybe something outside the tab/table and can display a similar blurb from 3ds

For those who want to play the game normally but with the improvements of the randomizer. All locations will contain their vanilla items. This supercedes all item shuffle, logic, hint, and item pool settings. You can still use non-vanilla world settings such as adult start or entrance shuffle, but the game may require glitches to complete if you do

@Archez
Copy link
Contributor

Archez commented Dec 16, 2022

Entrance rando fix for vanilla has been PRed upstream gamestabled/OoT3D_Randomizer#608

@lilacLunatic
Copy link
Contributor

In this PR, hints seem to be broken - read: unavailable - even in non-vanilla logic seeds (or at least no logic ones).

@lilacLunatic
Copy link
Contributor

The entrance to temple of time seems to always lead to temple of time, even with entrance shuffle set to "all". This will happen even though another entrance also leads to temple of time.

@briaguya0 briaguya0 force-pushed the develop branch 2 times, most recently from 05bd4a3 to ba13e6b Compare January 17, 2023 05:34
@garrettjoecox garrettjoecox force-pushed the add-vanilla-logic-option branch from 3201f2d to f28f5cc Compare January 24, 2023 20:29
@garrettjoecox garrettjoecox force-pushed the add-vanilla-logic-option branch from d4ad53a to bd1e4ff Compare April 28, 2023 02:42
@garrettjoecox garrettjoecox force-pushed the add-vanilla-logic-option branch from bd1e4ff to 9ddc91a Compare June 5, 2023 00:52
@aMannus
Copy link
Contributor

aMannus commented Sep 13, 2023

Outside of merge conflicts, what is the status of this PR? I know we were using it for the speedrun build for quite some time back then, was there still any outstanding issues with it or is it good to go?

@aMannus aMannus added the merge conflicts PR has conflicts that need to be resolved before it can be merged label Sep 13, 2023
@Malkierian
Copy link
Contributor

Wasn't the only purpose for this getting all the cutscene skips into a vanilla run? We might want to focus instead on getting the gCutsceneSkip PR in instead.

@Archez
Copy link
Contributor

Archez commented Sep 13, 2023

yes and no, technically vanilla logic allows for vanilla item placement to be used with entrance randomizer (for people that would want that I guess). It's not something I'm particularly interested in supporting, but is at least one valid use case.

But I agree that the cutscene PR should probably be what we support first.

@aMannus
Copy link
Contributor

aMannus commented Sep 13, 2023

Does entrance rando need anything special to be "maintained" for this? If the PR is essentially ready to go, I could still see this being worth getting in, even if only as a stopgap until the cutscene skips are done and to allow entrance rando shenanigans.

@Archez
Copy link
Contributor

Archez commented Sep 13, 2023

Does entrance rando need anything special to be "maintained" for this? If the PR is essentially ready to go, I could still see this being worth getting in, even if only as a stopgap until the cutscene skips are done and to allow entrance rando shenanigans.

No, not that I recall. I think there was an entrance rando logic bug in the original testing, but I believe that is unrelated to vanilla logic, and is something we've seen before (temple of time access not guaranteed if I remember correctly).

@garrettjoecox
Copy link
Contributor Author

The one final piece here was disabling most of the rando UI or displaying a disclaimer that most options will have no effect when this option is on. I can get around to that at some point or someone else can

@aMannus
Copy link
Contributor

aMannus commented Sep 15, 2023

The one final piece here was disabling most of the rando UI or displaying a disclaimer that most options will have no effect when this option is on. I can get around to that at some point or someone else can

I'd say at first a disclaimer mentioning "any settings regarding item placement will have no effect" or something along those lines would suffice.

@garrettjoecox garrettjoecox force-pushed the add-vanilla-logic-option branch from 9ddc91a to 8bf2c11 Compare October 3, 2023 14:16
@garrettjoecox
Copy link
Contributor Author

Added this to the UI:
Screenshot 2023-10-03 at 9 20 47 AM

@garrettjoecox garrettjoecox force-pushed the add-vanilla-logic-option branch from 8bf2c11 to 3f75faf Compare October 3, 2023 14:21
@garrettjoecox garrettjoecox removed do not merge Not ready or not valid changes merge conflicts PR has conflicts that need to be resolved before it can be merged labels Oct 3, 2023
@garrettjoecox garrettjoecox force-pushed the add-vanilla-logic-option branch 2 times, most recently from 3aa1ccb to 472ef01 Compare December 2, 2023 07:27
@garrettjoecox
Copy link
Contributor Author

garrettjoecox commented Dec 2, 2023

Alright, this is ready for another look. Did another pass on making sure all settings are cleared, and used the same mechanism for "gDisableSettings" to disable most of the rando menus when this option is on. Hoping I can get @Caladius or Zeru to play test a hundo on this at least once this week then we can merge.

@garrettjoecox garrettjoecox force-pushed the add-vanilla-logic-option branch from 472ef01 to 349066f Compare December 2, 2023 19:07
@garrettjoecox garrettjoecox force-pushed the add-vanilla-logic-option branch from 349066f to a5508d3 Compare December 4, 2023 13:40
@garrettjoecox garrettjoecox force-pushed the add-vanilla-logic-option branch from a5508d3 to 50d9632 Compare December 4, 2023 13:59
@garrettjoecox garrettjoecox merged commit 2d22a3e into HarbourMasters:develop Dec 4, 2023
@garrettjoecox garrettjoecox deleted the add-vanilla-logic-option branch March 4, 2024 15:34
jamieklassen pushed a commit to jamieklassen/Shipwright that referenced this pull request Mar 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants