forked from HarbourMasters/Shipwright
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Bomb Arrows #10
Open
lilDavid
wants to merge
45
commits into
develop
Choose a base branch
from
bomb_arrow
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Bomb Arrows #10
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
* Fix the calculation of `areaChecksGotten` to account for flags functionality setting invisible checks. Change `areaChecksTotal` to dynamic calculation based on tracker visibility, now that all checks are being added to `checksByArea`. Both are updated in realtime when either "Show all GS locations" or "Hide right side shop items" are toggled. Reformat all remaining unencapsulated if statements. * Changed helper variable change and call to `RecalculateAreaTotals()` to when the options are toggled instead of checking every frame. Removed redundant if...else. Clarified areaChecksGotten increment/decrement functionality based on current status and incoming status change. * Removed unused code.
This reverts commit 96abadd.
* Move zeroing of triforcePiecesCollected to the beginning of `Randomizer_InitSaveFile()` to fix starting TFP count issues.
* Fix Fire Temple Boss Door Logic * Update soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp Co-authored-by: Adam Bird <[email protected]> --------- Co-authored-by: Adam Bird <[email protected]>
…3808) * fix tektite death texture loading * add string header
…hes don't produce a stack trace from which to glean that information. (HarbourMasters#3786)
…ourMasters#3827) * Restore Original Scene_CommandObjectList Behaviour * remove some vrom stuff * add some comments
* add map palettes per pulse to leverage shader caching * use unregister blended with kaleido maps * use Gfx_TextureCacheDelete for KD lava * bump lus * add miss tex clears for KD
…e DL reference (HarbourMasters#3810) * move ruto earing fix to real patch * use stringpath for ganon rubble
…eed to register changes. (HarbourMasters#3875)
Adds helper info for invert, distance, and transition speed options.
* Adds `FormatLocations` and `PRESET_ENTRY_TYPE_CPP_STRING` to allow for feeding `RandomizerCheck` values directly in presets instead of a string with magic numbers. * Switch to concatenation with `std::to_string`. * Forgot to remove <format> include XD
* cullzone * better cvar name * Update soh/src/code/z_actor.c * Update soh/src/code/z_actor.c --------- Co-authored-by: Garrett Cox <[email protected]>
…sters#3878) * Account for removed object dependency in Deku Scrub Leader * Update soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c --------- Co-authored-by: Garrett Cox <[email protected]>
…urMasters#3904) * dont let k overflow * Update soh/soh/z_scene_otr.cpp Co-authored-by: Archez <[email protected]> --------- Co-authored-by: Archez <[email protected]>
…ricks tabs to get around issue with saving blank CVar strings. (HarbourMasters#3916)
… after resetting SoH. (HarbourMasters#3925)
* Moves personal notes to the save file under a new itemTracker save section. * Update soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp --------- Co-authored-by: Archez <[email protected]>
…sters#3979) * Add `SohModalWindow` and `SohModal`. Runs as window, always "visible", but not drawing if no popups are registered. Adds error catching for save file corruption (malformed json) that renames the file in question to prevent future loading issues and uses `SohModalWindow` to inform the user of the error. * Apply suggestions from code review --------- Co-authored-by: briaguya <[email protected]>
…y over existing file. (HarbourMasters#3984)
MacReady Foxtrot
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.
Enable the check button in Enhancements > Items, then equip bombs onto the same slot as your bow.
Bomb arrows currently look identical to fire arrows but in fact are a distinct item.