Sarge-117
db9f608177
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-05 21:41:18 -07:00
briaguya
885d6dc6c2
Merge pull request #1422 from garrettjoecox/scrubs-trials-persist
...
Add merchantPrices to save file instead of loading from active spoiler log
2022-09-05 19:41:58 -04:00
Garrett Cox
1c13fdec5f
Add trials required and merchant prices to save file instead of loading from active spoiler log
2022-09-05 14:55:34 -05:00
aMannus
39852c9278
Fix Sold Out bug
2022-09-05 11:46:50 +02:00
aMannus
983ab139d5
Add another flag to skip mask shop
2022-09-05 00:35:56 +02:00
aMannus
70ab1406e1
Incorporate magic arrows in rando settings
2022-09-03 22:56:09 +02:00
Sarge-117
a260f680d1
Merge branch 'rando-next' into rando-enhanced-magic-arrows
2022-09-03 12:17:23 -07:00
briaguya
d90145da47
Merge pull request #1391 from aMannus/rando-skip-scarecrow
...
Rando: Add Skip Scarecrow's Song option
2022-09-03 15:04:58 -04:00
briaguya
8e49f0465c
Merge pull request #1399 from aMannus/rando-bombchu-drops
...
Rando: Add Bombchu Drops
2022-09-03 15:03:30 -04:00
Sarge-117
e1da7bf9af
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-03 11:58:38 -07:00
aMannus
6cd8d6ca3a
Clean up bool
2022-09-03 20:48:00 +02:00
Sarge-117
0151294648
Simplify mudwall collision check
...
There was no need to have a second collider specifically for Ice Arrow hits
2022-09-03 11:24:17 -07:00
aMannus
274242e0d7
Implement rando bombchu drops
2022-09-03 20:17:12 +02:00
Sarge-117
05f7b65d28
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-03 09:30:14 -07:00
Christopher Leggett
e079c254f1
Fixes Link starting with BGS
2022-09-03 09:39:03 -04:00
aMannus
8d2f63419f
Implement Skip Scarecrow's Song
2022-09-03 14:40:41 +02:00
briaguya
3a6d7fcfd0
and make it build
2022-09-03 04:23:25 -04:00
briaguya
975a854054
Merge branch 'develop-zhora' into z-to-rando-next
2022-09-03 03:47:09 -04:00
Christopher Leggett
350d0b91ed
Removes unneeded GiveLinkItem functions.
2022-09-03 02:47:42 -04:00
Christopher Leggett
36cc9d562c
Adds more options for Link's starting item.
2022-09-03 02:34:21 -04:00
briaguya
6daf357fd9
fix include fix build ( #1385 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-09-03 02:13:20 -04:00
Christopher Leggett
2015e3a041
Converts Song from Impa to use Item_Give
2022-09-03 01:48:07 -04:00
Baoulettes
d2fa0d6485
Rando: Fix Fast File Select seed loading ( #1252 )
...
* FixRandoLoading
* better methode
2022-09-03 01:33:24 -04:00
Christopher Leggett
a5804ca2b2
Makes Item_Give safe to use with a NULL globalCtx.
...
This should allow it's use for giving items to Link's Pocket
during rando save initialization.
2022-09-03 01:22:33 -04:00
louist103
8118947ab0
Windows crash handler. ( #1383 )
...
* Windows crash handler.
* Fix naming convention.
2022-09-03 01:15:43 -04:00
Christopher Leggett
a07ea091f0
Fixes crash when entering Ganon's Castle lobby on linux.
2022-09-03 00:20:50 -04:00
David Chavez
0ce0ab1260
Phase 1: Separate ImGui Drawing From LUS ( #1310 )
...
* Update LUS imported paths
* Introduce GameMenuBar
* Fix imports after LUS import paths change
* Move Randomizer
* Replace needs_save
* Migrate Developer Tools
* Migrate Cheats
* Migrate Enhancements
* Separate UIWidgets
* Add missing Hooks.cpp file
* Migrate Settings
* Remove UI methods from LUS
* Cleanup imports and exposed properties
* Cleanup more methods
* Fix project generation
* Fix CI compilation
* Remove resolved TODO
2022-09-03 00:00:04 -04:00
Christopher Leggett
64aca78450
Fixes Switch/Wii U crashes with Wonder Rupees and Bottleable Entities ( #1360 )
...
* Reorders switch statement to prevent some code that shouldn't execute.
* Potentially fixes bottleable entities crash
* Solves lack of ItemEntry for GI_MAX
* Adds comment clarifying new GetItemEntry
2022-09-02 19:19:12 +02:00
Garrett Cox
ee2f38ad91
Renaming of some randomizer item/check/get methods
2022-09-02 10:34:20 -05:00
Garrett Cox
c7a7059db4
Minor adjustments from feedback and rename CanObtain to ItemObtainability
2022-09-02 09:38:41 -05:00
Garrett Cox
676f8945ab
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into GetItemFromGet-changes
2022-09-02 09:15:31 -05:00
Sarge-117
83469f85e7
Move checkboxes to normal enhancement menu
...
Also comment clarity + capitalization
2022-09-01 17:47:25 -07:00
Sarge-117
b4d14e708e
Check for CVar only
...
Instead of (Cvar && n64dd)
2022-09-01 17:08:34 -07:00
Sarge-117
9b5774cca7
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-01 17:05:48 -07:00
briaguya
26c41079bd
Merge pull request #1362 from lilDavid/rando_biggoron_fix
...
Randomizer: Fix Biggoron checks
2022-09-01 12:50:37 -04:00
briaguya
5a009590fc
Merge remote-tracking branch 'origin/develop-zhora' into ztorn
2022-09-01 12:06:25 -04:00
lil David
c84654b202
Always check n64ddFlag before bgsFlag
...
that order is consistent with the existing condition in EnGo2_GetStateGoronDmtBiggoron
2022-09-01 09:23:08 -05:00
lil David
0a744cde01
Clarify comments
2022-09-01 08:11:17 -05:00
lil David
ea9db56914
Merge remote-tracking branch 'upstream/rando-next' into bombchu-logic
2022-09-01 07:59:09 -05:00
lilDavid
cfaed3ded0
Make Biggoron ignore whether you have BGS in rando
2022-08-31 22:07:34 -05:00
louist103
584a4ad818
Linux crash handler ( #1209 )
...
* crash handler linux
* cleanups
* missing underscore
* more cleanups
* cleanups
* 32 bit
2022-08-31 22:59:38 -04:00
Sarge-117
d117b13c46
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-08-31 16:58:40 -07:00
briaguya
32c36eb5c4
Merge pull request #1355 from leggettc18/rando-next-chest-fixes
...
Randomizer: Fixes a few bugs related to chests.
2022-08-31 16:15:46 -04:00
Christopher Leggett
042d6f3865
Fixes a few bugs related to chests.
2022-08-31 10:57:59 -04:00
Christopher Leggett
776219fb52
Backports a fix for sheik checks from rando-next ( #1340 )
...
* Fixes some Sheik checks I had accidentally set the wrong flag for.
* Removes duplicate switch case from cherry-pick
2022-08-31 15:25:47 +02:00
Sarge-117
c4c15e91bf
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-08-30 11:06:51 -07:00
Sarge-117
8e2f035278
Split into two enhancements
...
"Blue Fire Arrows" and "Sunlight Arrows"
2022-08-30 11:06:42 -07:00
Christopher Leggett
60257b98a4
Oops. Missed closing bracket.
2022-08-30 11:21:29 -04:00
Christopher Leggett
3856d1b0a7
Fixed small key case that was behind an else and shouldn't have been
2022-08-30 11:00:47 -04:00
Christopher Leggett
99674ff88c
Readds missing workaround for spirit temple and ganon's castle keys.
2022-08-29 19:19:01 -04:00
