Even more fixes and tweaks #595
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
Kewlan
force-pushed
the
tweaks-and-fixes-3
branch
from
5ffd0a9
to
abea075
Compare
- Allow From/To toggle in All entrance tracker, fixing spoiling bug. Also change code in Gfx_DrawButtonPrompts to use offset. - Add rupees to shop items in location tracker. - Always reveal LACS item location when Ganon's Boss Key is placed there. - Add Megaton Hammer to ISG logic. - Restore settings to default before loading a custom preset, properly resetting new options missing from that preset. - Add new and adjust existing descriptions for clarity. - Adjust code for custom info menu options to support optional options. - Split some location tracker groups for easier scrolling/readability and to match entrance tracker.
Kewlan
force-pushed
the
tweaks-and-fixes-3
branch
from
abea075
to
839f612
Compare
PhlexPlexico
added a commit
to PhlexPlexico/OoT3D_Randomizer
that referenced
this pull request
Dec 31, 2022
* Fix flag for Granny's item (gamestabled#575) * Fix Various Grotto Return Issues (gamestabled#576) * Add in overworld spawns, warp songs, and owl drops to ER * Add support for one-way entrances and decoupled entrances in entrance tracker * Restructure the entrance tracker to properly account for the GV -> Lake Hylia entrance * Remove debugging statements * Fix formatting in new logic areas * Add descriptions for the new settings * Allow users to choose which entrance types go into the mixed pool * Add Ganon's Castle entrances to the entranceData table * Adjust yellow color for color blindness * Change 'Src' and 'Dst' to 'To' and 'From' * Add new ER options to full chaos preset * Change the condition for handling random grottos * Properly clear grotto state and handle dynamic exit edge case * add missing include * Fix child B button glitch (gamestabled#581) * add decoupled entrances to spoiler log output (gamestabled#580) * Generalize grotto return fix (gamestabled#578) * Fix glitched logic errors (gamestabled#582) * Fix glitchled logic errors near world root * remove adult rquirement from glitched logic forest gs * Various logic fixes (gamestabled#583) * MS shuffle logic fixes * More logic fixes * ZD OoB Jumpslash fix * KF Deku Tree logic fix * Deku Tree to KF logic fix * Additional Mirror World settings (gamestabled#585) * Random mirror world settings * Make MW option U8 * Complete Italian translations (gamestabled#586) * Complete Italian translations Head of squashed commits: 0760138 * Remove obsolete overloads * Change handling of lengthy shop item names * Minor changes to English hints End of squashed commits * Support plural for item hints * Add plural markers for Italian + minor fixes * Misc. fixes * Various Bug Fixes (gamestabled#588) * Fix overworld spawn at grotto exit * Fix crash at spoiler log generation * Fix blue warps leading to grotto exits * Curse traps fixes - room/heat timers clearing the curses; - FW depleting the curse timer; * Fix description for Child Deadhand w/ Sticks trick * Prevent picking up chests and Pedestal of Time * Complete german translation (gamestabled#590) * Cleanup formatting with clang-format. (gamestabled#558) Bring in .clang-format file from zeldaret/mm. Include other clang format changes. Per review adjustments from @Kewlan and @HylianFreddy Update clang format for short enums. Update trickNameTable with custom formatting. * Run automatic format script as code does not match clang format rules. Developers please rebase to avoid merge conflicts! * Fix some formatting errors (gamestabled#596) * Fix glitchled logic errors near world root * remove adult rquirement from glitched logic forest gs * fix some formatting errors * Run automatic format script as code does not match clang format rules. Developers please rebase to avoid merge conflicts! * Re-add locations that went missing from the clang formatter (gamestabled#597) * Fix glitchled logic errors near world root * remove adult rquirement from glitched logic forest gs * fix some formatting errors * the formatter also deleted some newer locations apparently, lol * Run automatic format script as code does not match clang format rules. Developers please rebase to avoid merge conflicts! * Add boss entryways to area logic (gamestabled#598) Preparations for boss room shuffle * Prevent duped decoupled entrances in spoiler log (gamestabled#589) * prevent duped decoupled entrances in spoiler log * fix more clang-format merge conflicts * Even more fixes and tweaks (gamestabled#595) - Allow From/To toggle in All entrance tracker, fixing spoiling bug. Also change code in Gfx_DrawButtonPrompts to use offset. - Add rupees to shop items in location tracker. - Always reveal LACS item location when Ganon's Boss Key is placed there. - Add Megaton Hammer to ISG logic. - Restore settings to default before loading a custom preset, properly resetting new options missing from that preset. - Add new and adjust existing descriptions for clarity. - Adjust code for custom info menu options to support optional options. - Split some location tracker groups for easier scrolling/readability and to match entrance tracker. * Settings string improvements (gamestabled#599) These changes allows us to freely move around and indent settings without affecting future custom presets. Also allows both the setting and the option to have a newline and text after/below. * Add missing scenes to interior areas (gamestabled#601) * Fix glitchled logic errors near world root * remove adult rquirement from glitched logic forest gs * fix some formatting errors * the formatter also deleted some newer locations apparently, lol * Add scenes to interiors where they were missed * Run automatic format script as code does not match clang format rules. Developers please rebase to avoid merge conflicts! * really fix decoupled entrances in spoiler log and preserve playthrough sphere (gamestabled#600) * Minor clang format fixes (gamestabled#602) * Fix merge error * Fix some weird formatting in C code * Add manual trigger for clang-format * Add SFX to junk hints (gamestabled#603) * Add SFX to junk hints Old implementation: 8b678b6 * Minor fix to Italian hint * Fixes and tweak 4 (gamestabled#604) * Fixes and tweak 4 - Make random cosmetics consistent using a separate generator - Remove patch for brown boulder for multiplayer - Update the item text of Ruto's pickup message in Jabu * Improve Ruto pickup message Co-authored-by: HylianFreddy <[email protected]> Co-authored-by: HylianFreddy <[email protected]> * Fix Saria's hints and external texture mods (gamestabled#605) * Don't touch Link's model if custom tunics are off * Register Saria's hints after talking to stone * docs: highlight region restrictions (gamestabled#606) * Guarantee Goron Pot Reward on First Try (gamestabled#607) * fix entrance playthrough not showing in the spoiler log for vanilla logic (gamestabled#608) * Fix excluded locations always receiving the same items (gamestabled#610) * MS shuffle logic fixes * More logic fixes * ZD OoB Jumpslash fix * KF Deku Tree logic fix * Deku Tree to KF logic fix * Shuffle item pool after generation * Hide Exclude Locations options when certain settings are on (gamestabled#592) * Properly Exclude Locations * Indent fix * Run automatic format script as code does not match clang format rules. Developers please rebase to avoid merge conflicts! * Add option to use Rupees as ammo (gamestabled#591) * Use Rupees as Ammo * Make magic a bit less expensive * Allow arrows replenishing when using fire/ice/light bows * Quick fix, missing parenthesis * Further fix to magic count Magic only gets spent when it's not being used, aside from Lens of Truth. * Cosmetics: Apply custom Navi colors to target reticle (gamestabled#611) * Rename fairy colors functions * Fix case typo * Apply custom Navi colors to target reticle * Run automatic format script as code does not match clang format rules. Developers please rebase to avoid merge conflicts! * Improve build process (gamestabled#614) * Attempt using a new image. * Rebase + update versions for actions. Co-authored-by: HylianFreddy <[email protected]> Co-authored-by: gymnast86 <[email protected]> Co-authored-by: Adam Bird <[email protected]> Co-authored-by: Nessy <[email protected]> Co-authored-by: Schicksal88 <[email protected]> Co-authored-by: gymnast86 <[email protected]> Co-authored-by: Colin E <[email protected]> Co-authored-by: Jesse Stricker <[email protected]> Co-authored-by: Charade <[email protected]>
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.
Also change code in
Gfx_DrawButtonPromptsto use offset.I also tried increasing
SPOILER_ITEMS_MAXandSPOILER_STRING_DATA_SIZEinspoiler_data.h, but that would cause unmapped reads when at theWriting Patch...stage of seed generation depending on other settings, like entrance shuffle. Currently the location list stops early with too many locations available.