Gilded Sword Check Prereq Fix and WFT, SHT, and GBT SF Logic Adjustments #8
Conversation
This file contains hidden or 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
Logic Fix
Fixes Captain Keeta Chest & Dampe Digging Reward Chest as they were not overriding correctly
Update item_location.cpp
Update Z3DR
Updates Z3DR subrepo and fixes erroneous Longshot option in starting inventory
Update Z3DR + Settings
Update Z3DR subrepo.
Update submodule
Update repo once more for bug fixes.
This fixes swamp archery not giving the correct items and small keys not giving the first key.
Update patch code.
Greay -> Great
-Fixes Great Fairy Reward self shuffle so it now properly only places Great Fairy Rewards at Great Fairy locations. - Adds new ITEMTYPE_GFAIRY and applies it to items given by Great Fairies to help filter those items for the Great Fairy Reward : Great Fairies option. - Fixes Generation Menus so that the cursor on the version select screen defaults to 1.0 instead of staying on whichever index was selected on the previous screen (IE. if Citra was selected as the play mode then the cursor would stay on the second postition and be on 1.1) - Hopefully fixes Starting Bottles so Bottle 1 doesnt duplicate across all 7 bottles if only 1 bottle was selected. - Update Z3DR
Update map names.
Update repeatable bottles to use refills instead.
Various Fixes
-Adjust fill algorithm to not place deku merchant items separate, fixes a potential softlock issue with item placement. - Fixes Great Bay, Stone Tower, and Romani Ranch Maps not giving the correct map. - Adds Romani's game into location pool because it was missing for some reason. - Adds initial Scarce and Minimal Item Pool settings, will likely need to be adjusted later. - Adjusts logic for entering the Clock Town Observatory from East Clock Town, Now requires BombersNotebook or the new Skip Bombers Minigame option, this is done as Jim will not allow you to repeat the game to get the code again even if you do not currently own the notebook. - Adds SkipBombersMinigame option, this will both set the code to 11111 and move the bomber NPC so you can just walk in.
Various Fixes 2
- Removes extra Bomb Bag from Pool - Exchanges the static 30 Arrows & 10 Bombchu items from the list of items for the Shuffle Moon Items options for junk items - Fixes ConditionsMet function so it actually checks for conditions - Removes WIP tag from many settings descriptions as they are now no longer WIP, Also removes iceTrapsNormal description as it is redundant with iceTrapsOff and adjusted iceTrapsOff description to indicate that the base game also has 0 ice traps. - Removes Normal Ice Traps option from settings - Adds additional checks in the spoiler log generation to always reveal starting items that are given before game start and cannot be obtained otherwise. Also adds checks to always reveal Stray Fairies, Skulltula Token, and Song locations temporarily until they are added as checks.
i'll miss one more parenthesis I promise
It's found at the Boat Archery instead. Rename variables accordingly, and fix the vanilla fill.
Adjust the logic to require the Troupe Leader's Mask. May need more tweaks for entrance shuffle.
Make it more likely to work with entrance shuffle.
Logic updates - Adjusts naming convention of Swamp Archery Bottle away from Dampe Digging Bottle as the location was switched in 3D - Updates Mystery Milk quest logic to ensure you are able to turn in the milk and keep the bottle before including the location in logic. Also adjusts logic around the Mystery Milk item to not count the bottle until it can be turned in.
- Adjusts Gilded Sword check to account for needing to do the Razor Sword check first (not mutually exclusive checks) - Adjusts various Stray Fairy requirements as not ALL locations require the Great Fairy Mask to obtain
…tments. (Z3DR#72) Fix gilded sword bug with milk quest.
- Adds option to show all spoiler log entries from the start - Adjusts spoiler log entries to no longer show checks that aren't randomized, Spoiler log now only shows checks that have randomized items.
Adjusts the Exclude location menu to only show locations that are randomized based on settings - locations not randomized (vanilla) will not be able to be excluded
Spoiler fixes & Exclude fixes - Adjusts the Exclude location menu to only show locations that are randomized based on settings - locations not randomized (vanilla) will not be able to be excluded - Adds option to show all spoiler log entries from the start - Adjusts spoiler log entries to no longer show checks that aren't randomized, Spoiler log now only shows checks that have randomized items.
Made sure not to not just do all locations as some is easier with bombs
…SS Tree has wrong brackets, No Deku needed for Koume Picto Check
* Razor and Gilded Sword Need to Check for B Sword * Change Ranch Defense to be nonrepeatable * Update item_location.cpp * Fixed Swordsman School and Old Lady Needing AnyBSword * Added Blast Mask to Applicable locations where Bombs could also be used Made sure not to not just do all locations as some is easier with bombs * Updated Zora's Cape Grotto Reqs * Bio Baba Grotto Needs Bombs, Business Scrub requires Observ. Access, SS Tree has wrong brackets, No Deku needed for Koume Picto Check * Fixed Road to SS Tree * Hungry Goron Requirements Update * Scrub Biggest Bomb Bag and Cow Grottos Req Updates
Adds in missing Inverted Eyegore Room and changes requirements to need small keys to enter
- Adds new Game Settings Menu containing the Region Select (NA/EU), Version Select (1.0/1,1), Play Option(3ds/Citra), IngameSpoiler (hide/show), and GenerateSpoilerLog (Yes/No) - Moved IngameSpoiler and GenerateSpoilerLog options from Logic Settiings to new Game Settings menu - Adds option to generate game for EU, currently only English is implemented. - Adjusts hints as one was causing issues with the xml spoiler log
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Made it so that you need at least 1 progressive wallet to do Gilded Sword check, since Razor Sword check is required to do it.
WFT, SHT, and GBT had some Stray Fairy adjustments.