Commit Graph

2099 Commits

Author SHA1 Message Date
aMannus 65011c53be Unlock early GBK door 2024-01-21 18:10:03 +01:00
aMannus ed3dddf1ce Fix check tracker + minor stuff 2024-01-21 13:05:48 +01:00
aMannus c2ffbe7201 Fix Ganondorf's Lair pots 2024-01-21 12:45:41 +01:00
aMannus cee52fba10 After merge fixes 2024-01-21 11:36:44 +01:00
aMannus 533678baeb Merge branch 'develop-rando' into potsanity 2024-01-21 11:07:46 +01:00
Pepe20129 22b9284240 Rando: Shuffle Swim (Rando V3) (#3795)
* Shuffle Swim

* Fix build
2024-01-15 09:20:57 -06:00
Pepe20129 ab3e9a7e54 Rando: Shuffle Child's Wallet (Rando V3) (#3794)
* Shuffle Child's Wallet

* Add support for "More info in file select"

* Fix build

* Fix build

* Update randomizer.cpp

* Update locacc_hyrule_field.cpp
2024-01-14 14:55:03 -05:00
Pepe20129 080038c39e Rando: Shuffle Beehives (Rando V3) (#3763)
* Shuffle Beehives

* Address review

* Fix build
2024-01-14 12:16:32 -06:00
Jordan Gilbreath 4cbf3a5621 Fishsanity - Rando v3 (#3738)
* Update z_fishing documentation from decomp

* undo sCameraAt/Eye rename

* forgot to include these defines Heehee

* adding enums, settings

* adding more stuff back in

* more work

* we're literally typing words into computer

* include unordered map

maybe this fixes mac build idk

* wahoo

* hmm

* add make sure disabled flag gets popped

* poggers in the chat?

* doing some refactoring

* fixing build

* documentation, moving fishsanity instance to rando

* move FS back to context, fixing build, mod progress

since FS is needed during rando generation & provides perpetual info abt. fishsanity in the seed, seems to make more sense if it lives on the context

* moving some stuff around

* it's starting to get real in here

* ELIMINATE FISHSANITYMETA

* IT WROKS

* Update trackers, fix pond fish flagging

* ZD fish shuffle initial checkpoint

* ZD fish "working"

aside from the crashing

* wrapping up

* fix for partial pond shuffle

* remove misc. unrelated debugconsole modification

* updating GI model

* get build working

* add a todo for this

* removeoopsie

* Rework hints a bit

* update hint loc

* Use visual indicator instead of despawning caught fish

---------

Co-authored-by: jordanpg <jordanpg@users.noreply.github.com>
2024-01-14 11:02:23 -06:00
Pepper0ni eb5f7688f8 Add more static hints (#3543)
* WIP biggoron and big poes hint

* commit v0 of biggoron and big poes hints

* adjust for settings update

* Add more hints

* Finish extra Basic Static Hints

* remove vestigial code

* Forgot to remove this

* try to fix windows build

* fix build post conflcit res

* remove StaticHintData as redundent

* last cleanup
2024-01-10 09:44:11 -06:00
Christopher Leggett a196dd6b7e Streamline hint generation (#3401)
* reimplement 3drando's hashtag color replacement system.

Also generates merchant text at seed gen time instead of runtime.
By merchants, I mean Bean Salesman, Medigoron, Granny, and Wasteland
Bombchu guy. Scrubs and shops are still dynamic at runtime.

* Improved auto-formatting and fixed altar text.

* Gets hint text for spoiler direct from context.

* Removal of now unused code.

* Change warp song hint generation/retrieval

Generates full warp location text instead of just location names and stores all six in the custom message tables for later retrieval as opposed to dynamically swapping in the location names every time the text is rendered.

* Change Frog Ocarina Game Hint generation/retrieval

Similar to previous changes, removes the on-the-fly generation aspect of it and just generates the full hint text once during seed generation.

* Update soh/soh/Enhancements/randomizer/3drando/text.hpp

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

* Fix submodules appearing as changed files.

* Fix WOTH/Foolish colors to match develop-macready.

* Fixes backwards colors for area and item in some hints.

---------

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
2024-01-08 14:41:33 -05:00
Malkierian 467ee7ad12 Logic class (#3812)
* Convert `Rando::Logic` to a class.

* Readd `LogicReset` as `Logic::Reset` for resetting logic mid-generation-cycle to allow seed generation to actually work.

* Change `IsChild` and `IsAdult` to `CanBe` variants.

* Make it buildable.

* First LogicVar class.

* Revert CanBe changes to Is (adult & child) as I'm no longer sure that it's a good one.

* Update soh/soh/OTRGlobals.cpp

Use existing gRandoContext reference.

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

* Conflict resolution cleanup (plus removing SaveContext references).

---------

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
2024-01-08 08:39:15 -06:00
aMannus 3840afcb39 Merge branch 'develop-rando' into potsanity 2024-01-08 15:38:39 +01:00
Christopher Leggett b96df0b642 Fixes parsing of spoiler files in plando mode. (#3823)
It was specifically failing on Hints because of changes to the spoiler output that were not reflected in the parsing code.
2024-01-08 08:37:24 -06:00
Christopher Leggett 63413e8159 Explicitly clears the entire ItemLocations array. (#3820) 2024-01-08 08:37:10 -06:00
aMannus 59aef331b3 Update magic to blue rupees 2024-01-06 22:54:10 +01:00
aMannus fe9e1e0d76 Merge pull request #34 from Caladius/potsanity_v1
Vanilla Drop List
2024-01-06 22:43:21 +01:00
Caladius 6157471a2e Vanilla Drop List 2024-01-06 15:29:00 -05:00
aMannus ded58e4e42 Tweak items to skip cutscenes for 2024-01-06 21:10:09 +01:00
aMannus ba9577c3b3 Merge branch 'develop-rando' into potsanity 2024-01-06 20:07:09 +01:00
aMannus 039ddff5a7 Add proper check tracker entry exclusion 2024-01-06 20:06:31 +01:00
Christopher Leggett 1669393277 Fixes a regression in creating settings string. (#3813) 2024-01-06 12:52:03 -06:00
aMannus 1865669b19 Remove unused hints 2024-01-06 19:51:45 +01:00
aMannus 5bd5025309 Merge pull request #33 from Caladius/potsanity_v1
Updates to Parameters and RHT information
2024-01-06 19:41:21 +01:00
Caladius 9bc837da24 Updates to Parameters and RHT information 2024-01-06 13:37:29 -05:00
Pepper0ni 80e6e899a8 Fix other hints not getting reset (#3811) 2024-01-06 11:08:06 -05:00
Christopher Leggett 8b8f11d72e Consolidation of Trick Settings data (#3798)
* Adds TrickOption subclass and fills in extra info.

Fills in the extra info from randomizer_tricks.cpp that other Options don't have (hence the subclass for Tricks specifically).

* Uses new definitions of tricks in ImGui menu.

* Removes randomizer_tricks.cpp/h

* Adds new tricks.cpp/h to hold some static data and functions.

* Refactors Tricks namespace into a class with only static memebers and functions.

* Fixes bug with Trick Tag system.
2024-01-06 11:07:19 -05:00
aMannus ff2df9c772 Fix dungeon/overworld only settings 2024-01-06 13:58:47 +01:00
Pepper0ni 4d2ca29940 Quickfix skip trials setting (#3800)
* quickfix skip trials setting

* Change to set trial count to 0 when skipping
2024-01-05 15:19:23 -05:00
aMannus a61594d796 Prepare default pot contents, fix/add dungeons 2024-01-05 20:55:24 +01:00
aMannus 350d521c82 Fixes 2024-01-05 17:04:18 +01:00
aMannus 8c78154aff Break up shuffle pot options to dungeon/overworld/all 2024-01-05 14:19:40 +01:00
Pepper0ni 7e2a13e7d8 Quickfix giants knife counting as a kokiri sword (#3802) 2024-01-04 15:49:10 -05:00
aMannus 76c2c5c4e5 Fix build 2024-01-04 00:31:02 +01:00
aMannus 90c49d7a33 Re-order enums + start hints per region 2024-01-04 00:26:06 +01:00
aMannus e6755ff99d Remove vanilla placements 2024-01-03 22:45:41 +01:00
aMannus 637e905a8e Merge branch 'develop-rando' into potsanity 2024-01-03 21:52:00 +01:00
aMannus 532824e5d7 Merge pull request #32 from Caladius/potsanity_v1
Potsanity MQ
2024-01-03 21:21:45 +01:00
Garrett Cox 7e1f72e17d Merge pull request #3785 from Malkierian/dev-merge
develop -> develop-rando 20240102
2024-01-03 06:09:47 +00:00
Malkierian d2ec346d0e Merge branch 'develop' of github.com:Malkierian/Shipwright into dev-merge 2024-01-02 17:28:23 -07:00
Christopher Leggett 96353c0b3b Fixes Pre-Clearing of Ganon's Trials. (#3783) 2024-01-02 17:19:56 -05:00
Pepper0ni 46abda83d2 probably fix glaring hint issues (#3752) 2024-01-02 16:23:33 -05:00
Pepe20129 1699eea009 Remove special IAs (#3453)
* Remove special IAs

* Add clarifying comment
2024-01-02 00:29:47 -05:00
Jordan Gilbreath 944a4c2e46 Fix settings persistence across sessions (#3779)
Co-authored-by: jordanpg <jordanpg@users.noreply.github.com>
2024-01-01 19:20:34 -06:00
Garrett Cox 03d907b843 Merge pull request #3778 from HarbourMasters/develop-macready
macready -> develop
2024-01-01 16:23:58 +00:00
Amaro Martínez 96abadd904 Update Boost download URL (#3776) 2023-12-31 16:06:47 -05:00
Malkierian fa8a0e2a76 [Rando] Fix Check Tracker Area Totals (#3758)
* 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.
2023-12-31 13:58:31 -05:00
Christopher Leggett c9907ed5fc Allows rendering custom models as Ice Traps in GetItem Animations. (#3760) 2023-12-30 12:10:50 -05:00
Christopher Leggett dbb1e60734 Fixes some Spoiler Parsing Bugs (#3759)
* Fixes bug causing dropped spoiler not to be parsed.

* Fixes bugs with parsing enabled tricks

* Fixes bugs with parsing excluded locations.

* Fixes bugs parsing the Bombchu Drops setting
2023-12-30 12:10:31 -05:00
Christopher Leggett 8cb06d2d5d Fixes some "seed bleed" instances (#3766)
* Should fix seed bleed between multiple saves and loaded spoilers by resetting the Rando::Context before loading a save.

* Only reset for rando saves.
2023-12-30 12:09:46 -05:00