1
0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-25 01:28:54 -05:00
Commit Graph

1610 Commits

Author SHA1 Message Date
aMannus
59aef331b3 Update magic to blue rupees 2024-01-06 22:54:10 +01:00
aMannus
fe9e1e0d76
Merge pull request 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. () 2024-01-06 12:52:03 -06:00
aMannus
1865669b19 Remove unused hints 2024-01-06 19:51:45 +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 () 2024-01-06 11:08:06 -05:00
Christopher Leggett
8b8f11d72e
Consolidation of Trick Settings data ()
* 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 ()
* 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 () 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
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. () 2024-01-02 17:19:56 -05:00
Pepper0ni
46abda83d2
probably fix glaring hint issues () 2024-01-02 16:23:33 -05:00
Pepe20129
1699eea009
Remove special IAs ()
* Remove special IAs

* Add clarifying comment
2024-01-02 00:29:47 -05:00
Jordan Gilbreath
944a4c2e46
Fix settings persistence across sessions ()
Co-authored-by: jordanpg <jordanpg@users.noreply.github.com>
2024-01-01 19:20:34 -06:00
Garrett Cox
03d907b843
Merge pull request from HarbourMasters/develop-macready
macready -> develop
2024-01-01 16:23:58 +00:00
Amaro Martínez
96abadd904
Update Boost download URL () 2023-12-31 16:06:47 -05:00
Malkierian
fa8a0e2a76
[Rando] Fix Check Tracker Area Totals ()
* 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. () 2023-12-30 12:10:50 -05:00
Christopher Leggett
dbb1e60734
Fixes some Spoiler Parsing Bugs ()
* 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 ()
* 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
Christopher Leggett
75f9775ad8
Merge pull request from HarbourMasters/develop
develop->develop-rando 20231229
2023-12-29 18:25:16 -05:00
shinra-electric
b7342a7847
[macOS] Add Architecture Priority to Info.plist ()
* Add Architecture Priority to  Info.plist

This allows the app bundle to be launched natively on Arm without the need for Rosetta.

* Remove arch shenanigans in soh-macos.sh.in

Shouldn't be necessary now...

* Add back launching the binary in soh-macos.sh.in

Accidentally removed launching the binary from the script.
2023-12-29 18:02:22 -05:00
Jérémy Lugand
a08943edc8
Fix typos in scenes_fra.json ()
* Update scenes_fra.json
2023-12-29 18:00:06 -05:00
Sarge-117
bedb0a1768
Add LLR entrance from silo to the better debug warp screen ()
* Add silo exit

* Back Tower
2023-12-29 17:57:31 -05:00
Pepe20129
807b00a058
Fix crashing when creating a new file () 2023-12-29 13:36:56 -05:00
Garrett Cox
6c88d33b19
Merge pull request from HarbourMasters/develop
develop -> develop-rando
2023-12-28 20:12:39 +00:00
Pepe20129
c860f7a73a
Rando: Shuffle Ocarina Buttons (Rando V3) ()
* Shuffle Ocarina Buttons

* Address review

* Add trick names

* Temporarily remove the ocarina button ice trap models

* Update soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp

Fix lost closing brackets from merge resolution.

---------

Co-authored-by: Christopher Leggett <chris@leggett.dev>
2023-12-28 14:19:23 -05:00
Patrick12115
81ec2805ee
scaling () 2023-12-28 12:04:30 -05:00
Patrick12115
b80452b2b8
Multiplier () 2023-12-28 12:04:20 -05:00
Garrett Cox
f6a6b880c9
Only emit changed flags () 2023-12-28 08:23:03 -06:00
PurpleHato
1fff15753a
ADD: Enhancement-->Graphics-->Colour Temple of Time's Medallions ()
* First dirty testing process

* Forgot a 2 for the second Dlist patching of Shadow

* TWEAK: GI integration

* DEL: Unucessary includes + whitespace

* TWEAK: No stones refactor for now, sorry I'm kinda lazy right now, don't hate me, please! T_T

* Stone removal part 2, sometime I forget to save the changes :derp:

* Tiny last tweaks, hopefully

* Add to rando preset

* Tweak: typo

* TWEAK: Trigger on toggling on/off

* TWEAK: adressed reviews 💯

* Please mate, excuse my British typing
2023-12-27 23:46:00 -05:00
Pepe20129
dc4347253d
Item cycling improvements ()
* Simplify item cycling

* Simplify selection variables

* Fix adult bunny hood and gray appropriate items

* Don't go into cycling mode when there's no items to cycle to

* Restore updating c buttons

This was previously done with `Inventory_ReplaceItem` but that led to problems when another slot had the same item as the one that's being cycled.

* Address review
2023-12-27 12:55:09 -05:00
Garrett Cox
a6bb6cf0a3
Hardcore mode v1 () 2023-12-27 12:50:56 -05:00
Pepe20129
e8096a2d94
Better actor viewer ()
* Update actorViewer.cpp

* Add more actors

* Add a search function

* Update actorViewer.cpp

* Add advanced mode for params
2023-12-26 19:09:04 -05:00
Garrett Cox
70e1017923
Add frame advance option to developer tools () 2023-12-26 19:08:37 -05:00
Adam Bird
6a7bcc4a5e
add more commands to dl viewer () 2023-12-26 17:13:48 -05:00
briaguya
99194a75f1
docs: update func_800FADF8 to Audio_ResetActiveSequences () 2023-12-26 13:30:49 -05:00
Garrett Cox
1979d78788 Merge branch 'develop' of garrettjoecox.github.com:HarbourMasters/Shipwright into develop-rando-develop 2023-12-26 10:33:48 -06:00