briaguya
bafd016cd9
Merge pull request #1413 from aMannus/rando-key-colors-default
...
Rando: Enable key colors matching dungeon by default
2022-09-05 19:09:37 -04:00
Garrett Cox
96a3354d45
Remove trialsRequired persisting in save manager
2022-09-05 15:12:30 -05: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
fb5aff393a
tooltip line break
2022-09-05 16:54:02 +02:00
aMannus
9afe3ca746
Fix gerudo keys, add disabled checkbox
2022-09-05 16:48:59 +02:00
aMannus
39852c9278
Fix Sold Out bug
2022-09-05 11:46:50 +02:00
Sarge-117
da7dc55317
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-04 20:18:54 -07:00
Sarge-117
5aaaccb72d
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-04 15:36:12 -07:00
aMannus
983ab139d5
Add another flag to skip mask shop
2022-09-05 00:35:56 +02:00
PurpleHato
a6937e9850
added hovertext for the number display
2022-09-04 21:31:50 +02:00
PurpleHato
47c7d3f061
always display XX/YY when in ammo/capacity mode
2022-09-04 20:39:56 +02:00
PurpleHato
e11ca62ee1
small tweaks and rename
2022-09-04 20:09:48 +02:00
PurpleHato
2c241d5fe8
Merge branch 'rando-next' into TrackerAmmoFix
2022-09-04 19:57:56 +02:00
Garrett Cox
6bf886ecae
Refactor DrawItemCount and Use EnhancementCombobox for tracker capacity options
2022-09-04 11:55:40 -05:00
Garrett Cox
1bbde39439
Ensure itemTrackerNotes vector is not fully empty
2022-09-04 02:06:42 -05:00
Sarge-117
347154c4d1
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-03 22:31:21 -07:00
briaguya
6439c45f26
Merge pull request #1402 from garrettjoecox/beans-obtainability-fix
...
Fix for beans obtainability
2022-09-03 20:04:11 -04:00
PurpleHato
6dbc292ff3
Fix: changes to please new LUS
2022-09-04 01:22:15 +02:00
PurpleHato
ed96a0c272
Merge branch 'rando-next' into TrackerAmmoFix
2022-09-04 01:08:26 +02:00
PurpleHato
27f613b3f8
All color logic for all types
2022-09-04 01:03:28 +02:00
briaguya
e55ec29d66
Merge pull request #1396 from garrettjoecox/item-tracker-notes
...
Persist item tracker notes
2022-09-03 18:40:32 -04:00
PurpleHato
d4bc5875d7
tweak on main logic
2022-09-03 23:49:15 +02:00
Sarge-117
938ecef131
Tooltip wording + line break
2022-09-03 14:27:27 -07:00
Sarge-117
e9822eed62
Add line break in tooltip
2022-09-03 14:25:47 -07:00
Sarge-117
dc4d8e322b
Update tooltip
2022-09-03 14:19:59 -07:00
Sarge-117
27e58842b0
Update tooltip
...
To inform the player that they might have to reload the room if they're enabling this for the first time.
2022-09-03 14:10:39 -07:00
aMannus
70ab1406e1
Incorporate magic arrows in rando settings
2022-09-03 22:56:09 +02:00
Garrett Cox
77a5d03019
Hook into file delete and clear notes
2022-09-03 15:46:33 -05:00
Garrett Cox
72660e2cfd
Fix for beans obtainability
2022-09-03 15:28:59 -05:00
PurpleHato
377c030469
Fixed capacity on ammmo tracking
2022-09-03 21:57:58 +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
b31b1ef157
Restore checkboxes in menu
...
Accidentally lost these during merge
2022-09-03 11:43:31 -07:00
Sarge-117
5a9540585a
Simplify mudwall collision check
2022-09-03 11:35:19 -07:00
aMannus
8d033c6766
Update settings.cpp
2022-09-03 20:29:45 +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
ae0ccb9cca
Missing break
2022-09-03 20:18:54 +02:00
aMannus
274242e0d7
Implement rando bombchu drops
2022-09-03 20:17:12 +02:00
briaguya
cbc181bc0a
Merge pull request #1392 from lilDavid/re-add_progressive_chus
...
Reimplement progressive Bombchus + fix bowling Bombchu prize
2022-09-03 14:13:17 -04:00
Sarge-117
a397b07ec4
Update location access logic
...
Including MQ locations in Spirit and GC now
2022-09-03 10:37:14 -07:00
briaguya
98dbbfda13
Merge pull request #1395 from leggettc18/starting-bgs
...
Fixes Link starting with BGS
2022-09-03 13:36:12 -04:00
Sarge-117
bb04e9d97d
Restore checkboxes to enhancements menu
...
These got lost in the merge
2022-09-03 09:57:35 -07:00
Sarge-117
43372155f2
Fix mistake from merge
...
oops
2022-09-03 09:39:42 -07:00
Sarge-117
92bb55531a
Merge remote-tracking branch 'upstream/develop-zhora' into zhora-magic-arrows
2022-09-03 09:32:00 -07:00
Sarge-117
05f7b65d28
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-03 09:30:14 -07:00
Garrett Cox
b92b1eaee6
Use SohImGui::RequestCvarSaveOnNextTick
2022-09-03 09:33:54 -05:00
Garrett Cox
90bf5988ee
Adjust Hooks include
2022-09-03 09:30:53 -05:00
Garrett Cox
8be6f6e441
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into item-tracker-notes
2022-09-03 09:19:14 -05:00
Garrett Cox
ed8966054c
Persist item tracker notes
2022-09-03 09:15:05 -05:00
Christopher Leggett
e079c254f1
Fixes Link starting with BGS
2022-09-03 09:39:03 -04:00
Christopher Leggett
5421ad27c9
Rando-next: Deku Nut and Seed ammo gives a blue rupee
...
Fixes #1390
2022-09-03 09:24:37 -04:00
lil David
f5fae6df32
Reimplement progressive Bombchus
2022-09-03 08:11:51 -05:00
aMannus
8d2f63419f
Implement Skip Scarecrow's Song
2022-09-03 14:40:41 +02:00
aMannus
3aefd4c519
gSaveContext access in GameMenuBar.cpp
2022-09-03 12:47:32 +02:00
briaguya
007540fb39
Merge branch 'develop-zhora' into z-to-rando-next
2022-09-03 05:55:40 -04:00
aMannus
f1dc980de8
Fixed autobreak after ImGui cleanup
2022-09-03 05:52:01 -04:00
briaguya
ea4e0652e7
bring back new rando dropdown
2022-09-03 04:41:43 -04: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
briaguya
50daabb794
Merge pull request #1353 from Sarge-117/update-navi-hints-rando
...
Rando: Navi text: Update German spellings, add some hints
2022-09-03 00:53:39 -04:00
Christopher Leggett
a07ea091f0
Fixes crash when entering Ganon's Castle lobby on linux.
2022-09-03 00:20:50 -04:00
Christopher Leggett
fba8fc2b74
Fix Ganons Trials coming from old save files. Fixes #1365
2022-09-03 00:20:07 -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
Sarge-117
9441b2ab1d
Update logic Cvar names
2022-09-02 19:37:02 -07:00
Sarge-117
33779823c8
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-02 19:10:28 -07:00
Sarge-117
6fe51cdd24
Remove redundancy in KD room
2022-09-02 19:10:16 -07:00
Garrett Cox
f6fd116adb
Cast randoGet for ganons boss key
2022-09-02 20:19:28 -05:00
Garrett Cox
e0b0776e02
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into GetItem-renaming
2022-09-02 20:07:34 -05:00
PurpleHato
f69d9697e9
Struct instead of ImVec + basic comportment for all case
2022-09-03 01:30:47 +02:00
briaguya
c1894f108f
Merge pull request #1380 from leggettc18/rando-next-key-fix
...
Fixes Ganon's Boss Key setting discrepancy
2022-09-02 18:33:47 -04:00
briaguya
34d99441d6
Merge pull request #1321 from aMannus/rando-settings-menu-even-moar-changes
...
Rando: Even more randomizer settings menu changes
2022-09-02 17:00:52 -04:00
PurpleHato
2ead2557f0
combobox title rename + no number tracking
2022-09-02 22:41:05 +02:00
PurpleHato
069f7c98a6
Enum + combo box
2022-09-02 22:07:05 +02:00
Christopher Leggett
0cdcc27e53
Fixes Ganon's Boss Key shuffled while regular boss Keys aren't.
2022-09-02 15:45:55 -04:00
Garrett Cox
a95edd25de
Merge branch 'GetItemFromGet-changes' of github.com:garrettjoecox/OOT into GetItem-renaming
2022-09-02 14:18:18 -05:00
Garrett Cox
1aa33a7940
Remove comments in OTRGlobals
2022-09-02 14:17:45 -05:00
Garrett Cox
1659f1f386
Re-add GetItemObtainabilityFromRandomizerCheck
2022-09-02 14:00:10 -05: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
164a43c9cb
Update logic for King Dodongo's room
...
Explicitly check for BlueFireAccess && HasBottle here, since using the Ice Arrows on the bombable floor is tricky due to its collision being very tiny
2022-09-01 22:00:46 -07:00
Sarge-117
b5a881f9ab
Add magic arrow enhancements, non-rando
...
Changes to red ice actor, sun switch actor, and mudwall actor to adjust their collision
2022-09-01 18:21:44 -07:00
Sarge-117
83469f85e7
Move checkboxes to normal enhancement menu
...
Also comment clarity + capitalization
2022-09-01 17:47:25 -07:00
Sarge-117
0626d80651
Fix missed comma
2022-09-01 17:13:34 -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
Christopher Leggett
812a1e7970
Added return statement in IsVanillaItem before keys.
2022-09-01 17:50:12 -04:00
briaguya
f391505b0e
Merge pull request #1344 from aMannus/more-random-rupee-names
...
Rando: German and more English random rupee names
2022-09-01 15:18:29 -04:00
aMannus
2f6e070223
Merge branch 'rando-next' into rando-settings-menu-even-moar-changes
2022-09-01 20:26:29 +02:00
