forked from HarbourMasters/Shipwright
-
Notifications
You must be signed in to change notification settings - Fork 13
Lock overworld doors Randomizer option #78
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
Closed
Closed
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
9c501f2
to
a2f68c4
Compare
e4c11cf
to
ca2786e
Compare
a2f68c4
to
59762bd
Compare
7cbb23c
to
596ea5e
Compare
9f75dcd
to
5ebea25
Compare
* filter randomizer checks in tracker Co-authored-by: Michael Stergianis <michael.stergianis@gmail.com> * Adds an option to hide empty areas Co-authored-by: Jamie Klassen <jamie@tenkeylabs.com> Signed-off-by: Michael Stergianis <michael.stergianis@gmail.com> * Removes extra whitespace Co-authored-by: Jamie Klassen <jamie@tenkeylabs.com> Signed-off-by: Michael Stergianis <michael.stergianis@gmail.com> * Changes gCheckTrackerHideFilteredAreas to default to true Refactors the for loop in shouldHideArea Signed-off-by: Michael Stergianis <michael.stergianis@gmail.com> * Addresses PR feedback * HarbourMasters#4021 (comment) * HarbourMasters#4021 (comment) Co-authored-by: Jamie Klassen <jamie@tenkeylabs.com> Signed-off-by: Michael Stergianis <michael.stergianis@gmail.com> * Updates config variable to gTrackers.CheckTracker.HideFilteredAreas Signed-off-by: Michael Stergianis <michael.stergianis@gmail.com> * Adds check visibility guard to shouldHideArea Refactors rcObject to check in passesTextFilter Signed-off-by: Michael Stergianis <michael.stergianis@gmail.com> --------- Signed-off-by: Michael Stergianis <michael.stergianis@gmail.com> Co-authored-by: Michael Stergianis <michael.stergianis@gmail.com>
…ers#3206) * Add all macros. Replace all randomizer seed setting CVars with appropriate macro. Cleaned up non-gameplay-critical things that are part of Spock Race rando presets (like RTA timing, displaying timer, displaying the glitch lineup tick, or Fast File Select). * Wrong slash... * Forgot "gManualSeedEntry". * Renamed CVars from "Mq..." to "MQ...".
* Split and clean up swap age logic * reorganise conditions into one statement
…Masters#3962) * Add console commands for randomizing sfx and cosmetic groups * Update naming and use constexpr * Update soh/soh/Enhancements/debugconsole.cpp --------- Co-authored-by: Archez <Archez@users.noreply.github.com>
…#3238) * Add all macros. Replace all randomizer seed setting CVars with appropriate macro. Cleaned up non-gameplay-critical things that are part of Spock Race rando presets (like RTA timing, displaying timer, displaying the glitch lineup tick, or Fast File Select). * Wrong slash... * Fix DEVELOPER_CVAR macro. Add GENERAL_CVAR macro. * Change Item Tracker CVars, including open window CVar. * Swapped open window CVars. * Swapped Entrance Tracker CVars. * Swapped Check Tracker CVars. Changed Item Tracker "HudEditMode" to "Draggable". * Renamed `RANDOMIZER_CVAR` to `RANDO_ENHANCEMENT_CVAR`. Swapped rando enhancement CVars. * Mirroring last commit from part 1 in randomizer.cpp * Another mirror from pt 1
… Remote (HarbourMasters#4030) * Swapped Audio Editor CVars. * Swapped Cheat CVars. * Swapped Developer Tools CVars. Also a couple General CVars. * Added REMOTE_CVAR. Swapped Remote CVars. * Missed an include.
* Standardized CVar macros to have `CVAR_` at the front instead of the end. Removed excluded and replaced sequence macros. * Missed a few developer CVars outside of `SohMenuBar.cpp` * 1 more.
Lots of renames. Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
* Add scene command parsers * Move logging & add logging cvar * Use new CVAR_DEVELOPER_TOOLS macro * Update soh/soh/resource/logging/SceneCommandLoggers.h --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
…sters#4257) * Fix Lake Hylia Water Level * Move logic to SkipBlueWarp handlers
* Port initial framework up to latest dev-rando. Includes about 15 items using the SCL structure for tracking. * Most other item variables ported to SaveContext in UpdateHelpers. * Removed individual Context retrievals in favor of single local variable in Logic to reference. * start of some diagnostics. caught some reverse logic with ApplyItemEffect. * more diagnostics * Resolve major logic issue with SetInventory flow in ApplyItemEffect. Other small logic issues in ApplyItemEffect. * Added a bit of logging. Add Double Defense to item effects. * revert hint gen bypass * item_list *actually* divorced from logicVar pointers. Several missed options for ApplyItemEffect, HasItem, and UpdateHelpers added in. Changed HasItem to a switch block for more performance. Seeds generate within 10-20 seconds in release mode. Further optimization is assumed possible. * Some formatting * Bit more formatting. * Couple review changes. * Incorporate progressive upgrades and skeleton key into SCL. Bit of cleanup. * Change `inLogic` to static array. * Fix bug in `BottleCount()` preventing Jabu Jabu from ever being in logic. * Fix bomb bag HasItem check. * Fix Gerudo Fortress and Ganon's Castle SmallKeys checks. * Change all logic use of `bool remove` to be `bool state` and work on the affirmative assumption. * Forgot the `Set(x)` uses in `Logic::Reset()`. * Fix fishing pole effect application. * fishing pole tweak * Add `RG_BOMB_BAG`, `RG_NUTS` and `RG_STICKS` to `HasItem()`. Fix silver and gold gauntlet checks in `HasItem()`. Change Nuts and Sticks helpers to use non-progressive RGs in `UpdateHelpers()`. * Change mSaveContext to simple pointer. Set `mSaveContext` to `&gSaveContext` when loading a save file. Modify `Item::GetGIEntry()` to use rando context's SaveContext pointer instead of the gSaveContext macros. Utilize `Item::GetGIEntry()` to get real RG of infinite upgrades and set rando infs accordingly, skipping upgrade level incrementing (which was causing overflow of wallets for some reason). * Rename all remaining references of LogicVar to variants of LogicVal. * Change final references to song LogicVars to CanUse calls, and remove them. * Separate equip and rand inf flag maps. Add Zelda's Letter and Weird Egg rand infs to map. Consolidate `HasItem` rand inf lookups using rand inf map and equips using equip flag map. Maps are static, so can be referenced with `Context::` instead of ctx pointer.
…3436) * Skeleton Fixes for various bosses and enemies * cleanup * revert breakpart changes --------- Co-authored-by: Adam Bird <archez39@me.com>
…Masters#4256) * Use manifest for windows DPI awareness (HarbourMasters#3270) * Update libultraship * Update libultraship
…arbourMasters#4259) * Fix an issue with a stray Rando::Context shared_ptr hanging around. * Fixes accidental leftover from when I found this bug on another branch * Properly reset randoContext on every save load, not just after save creation
…ourMasters#4195) * Fixes for the German translation in randomizer.cpp * Fixes for the German translation in hint_list.cpp * Fixes for the German translation in item_list.cpp * Fixes for the German translation in z_message_OTR.cpp * Fixes for the German translation in randomizer.cpp * Fixes for the German translation in randomizer.cpp * Additions for the German translation in hint_list_item.cpp * Fixes for the German translation in item_list.cpp * Additions for the German translation in hint_list_item.cpp * Additions for the German translation in hint_list_item.cpp * Fixes for the German translation in item_list.cpp * Additions for the German translation in hint_list_item.cpp * Fixes for the German translation in item_list.cpp * Fixes for the German translation in item_list.cpp * Fixes for the German translation in item_list.cpp * Fixes for the German translation in hint_list_item.cpp * Fixes for the German translation in hint_list_item.cpp * Fixes for the German translation in hint_list_item.cpp * Fixes for the German translation in item_list.cpp * Fixes for the German translation in item_list.cpp * Fixes for the German translation in hint_list_item.cpp * Fixes for the German translation in item_list.cpp * Fixes for the German translation in randomizer.cpp * Fixes for the German translation in item_list.cpp * Fixes for the German translation in hint_list_item.cpp * Fixes for the German translation in item_list.cpp * Fixes for the German translation in z_message_OTR.cpp * Fixes for the German translation in z_message_OTR.cpp * Additions for the German translation in item_list.cpp * Fixes for the German translation in item_list.cpp * Fixes for the German translation in hint_list.cpp * Fixes for the German translation in hint_list.cpp * Fixes for the German translation in randomizer.cpp * Fixes for the German translation in hint_list_item.cpp * Fixes for the German translation in hint_list_item.cpp * Fixes for the German translation in item_list.cpp * Fixes for the German translation in item_list.cpp * Fixes for the German translation in randomizer.cpp * Fixes for the German translation in randomizer.cpp * Fixes for the German translation in randomizer.cpp
* implement better culling * change draw distance to a slider * remove testing code * tweak
merge Macready Golf -> develop
…merge Merge develop -> develop-rando
* Fix tricks not getting disabled by button click. * Fix area trees not collapsing on enabled side of tricks list. * Fix difficulty tag button order for Linux. * Fix Collapse All, Open All, and Disable All. Prevent Disable All from disabling all despite areas being collapsed.
…sters#4292) * Fix fmt in savestates * Check Tracker Totals
…rMasters#4293) * Additions for the German translation in hint_list_exclude_dungeon.cpp * Fixes for the German translation in z_select.c * Fixes for the German translation in z_select.c * Additions for the German translation in hint_list_exclude_overworld.cpp * Additions for the German translation in hint_list_exclude_dungeon.cpp * Additions for the German translation in hint_list_exclude_overworld.cpp
…acent cleanups (HarbourMasters#3733) * Initial Bombchu rework implementation * Finish bombchus in logic overhaul * address reviews * Post resolution fixes * fix git being dumb * Readd Child Wallet To Bombchu Bowling Logic * post merge fixes * fix some oversights in bombchu shopping logic * doesn't work, linker errors * cleanup old reviews * Make it build, likely broken by VB * attempt to fix carpet man second purchse text * commit to change branch * mostly have carpet guy working * badly fix carpet salesman * fix better bombchu shopping * fix bombchu drops * remember you need bombchus in inventory to get drops * Address reviews * post-SCL clean up and redo the bombchu ammo logic to apply better to the spirit edge case * fix oversight which could have allowed for bombchus to logical exist when they shouldn't * Remove special bombchu playthrough checks which are causing bugs and no longer needed * fix Slingshot logic reset * Convert helpers I touched into CanUse and HasItem * last cleanups
…#4289) * Additions for the German currencies in randomizer.cpp * Additions for the German translation in hint_list_exclude_dungeon.cpp * Fixes for the German translation in z_select.c * Fixes for the German translation in z_select.c * Additions for the German translation in hint_list_exclude_overworld.cpp
…arbourMasters#4300) * Add jaby box skip door one point to glitchAiding and frog hint exception to NoForcedDialouge * address review
* Additions for the German translation in hint_list_exclude_dungeon.cpp * Additions for the German translation in hint_list_exclude_overworld.cpp
5ebea25
to
2881c57
Compare
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.
Figured I'd just throw together a little proof of concept. It is mostly functional but, this is based on top of HarbourMasters#3755 which is very much broken still so try at your own risk :)
Build Artifacts