aMannus
0f4e65eb46
Removed unneeded check after UI changes
2022-07-22 19:58:27 +02:00
aMannus
cbf4a9267f
Irmproved handling incompatibilities
2022-07-22 18:44:46 +02:00
aMannus
0ee898bd56
Improved disabling of settings
...
For Skip Child Zelda (and possibly other options in the future)
2022-07-22 12:21:12 +02:00
aMannus
97c37eb46a
Changed default values
...
Shuffle/open settings now align with the first option which makes it the option closest to vanilla.
Also added default values for rainbow bridge settings so they align with the max value instead of 0.
2022-07-22 09:48:30 +02:00
briaguya
cab9499a76
Merge pull request #338 from HarbourMasters/develop-zhora
...
zhora -> rando-next
2022-07-21 21:05:35 -04:00
David Chavez
b3d3148383
Merge branch 'develop-rachael' into develop-zhora
2022-07-22 02:34:55 +02:00
briaguya
27d37e9d00
fix dot song Only vs only issue
2022-07-21 20:06:19 -04:00
Baoulettes
df756b2ce0
Cosmetics editor - Feature requested ( #841 )
...
* Precise positionning, reset margin and pos
* Fix big hearts issues
* add + and - to the editor
* add const to the char*
* Fix labels issues
2022-07-22 01:33:39 +02:00
Baoulettes
c19beca980
Fast Save Loader crashes fixes ( #848 )
2022-07-22 00:36:46 +02:00
RaelCappra
e41873fff4
Savestate crash fix on Ubuntu ( #843 )
2022-07-22 00:34:04 +02:00
Josh Bodner
1d208c7dc2
Revert to using boolean in json
2022-07-21 11:04:37 -07:00
Josh Bodner
2edc81ee2d
Attempt to restore formatting of randomizer.cpp
2022-07-21 11:03:28 -07:00
Christopher Leggett
21c585b2ce
Removes randomizer_custom_messages, as I relocated its logic elsewhere.
2022-07-21 13:10:04 -04:00
Christopher Leggett
b5dc097587
Cleanup and move most hint logic to CustomMessage.
...
Haven't removed where rando stores the hints for itself and the ganon and altar hints are still pulled from the randomizer class' local storage, but gossip stone hints are pulled from the custom message table now.
2022-07-21 13:05:15 -04:00
aMannus
6f082e1769
Fixed rename breaking maps/compasses
2022-07-21 17:32:28 +02:00
aMannus
9ce552659a
Changed iceTrapped var name/type and tooltip
2022-07-21 12:22:36 +02:00
aMannus
2c5bdbfd4b
Merge branch 'rando-next' into spoopy-spiders
2022-07-21 08:30:31 +02:00
Josh Bodner
cddca2700a
Move Child Zelda spoiler write out of for loop so it's not repeatedly hit
2022-07-20 23:08:57 -07:00
Josh Bodner
17b3f65276
Fix the issue for real
2022-07-20 22:57:18 -07:00
Josh Bodner
75a4d2cf99
Actually use the same strings everywhere lol
2022-07-20 21:50:55 -07:00
Josh Bodner
795ee54f2b
Remove use of std::format since Jenkins doesn't like it
2022-07-20 21:44:32 -07:00
briaguya
1944b68d19
fix starting inventory
2022-07-20 23:36:39 -04:00
Josh Bodner
3633bdeeaf
Fix Child Zelda Skip rando setting always on
2022-07-20 19:57:38 -07:00
aMannus
3be2dbd005
Added nighttime GS sun's song option
2022-07-20 14:33:12 +02:00
aMannus
36d451eb85
Add setting tooltip and fixed an oopsie
2022-07-20 14:07:01 +02:00
aMannus
715a4f7315
Added all remaining tokens(?)
2022-07-20 13:37:28 +02:00
aMannus
5c25364eff
Nother batch of spooders
2022-07-20 11:56:03 +02:00
aMannus
bee6fdb8ba
Small fix after UX merge
2022-07-20 11:04:01 +02:00
aMannus
a4af34c8dc
Merge branch 'rando-next' into spoopy-spiders
2022-07-20 10:58:53 +02:00
Christopher Leggett
c5f66373c3
Adds ability to store and retrieve textbox size and position.
2022-07-19 22:51:39 -04:00
Christopher Leggett
2d1aa1d13a
Merge in develop-zhora
2022-07-19 20:28:21 -04:00
aMannus
69de5ac14a
Fixed all possible ice trap scenarios
2022-07-19 22:29:52 +02:00
aMannus
16e676d2d0
Removed some spaces that were missed
2022-07-19 16:57:54 +02:00
aMannus
51dae73387
Merge branch 'develop-zhora' into spoopy-spiders
2022-07-19 13:33:45 +02:00
aMannus
0e4169ee84
Revert "Revert "Merge branch 'develop-zhora' into rando-settings-overhaul""
...
This reverts commit 109485188cfc8c47698ebb53b009cf852a17ef58.
2022-07-19 13:09:24 +02:00
aMannus
1c384c5b3e
Revert "Merge branch 'develop-zhora' into rando-settings-overhaul"
...
This reverts commit 55f114e3d499f510eadab5f918b7eb95fd9dd249, reversing
changes made to 2809cd01dffb7f1a1df1068adaae8f2b1b44ae85.
2022-07-19 13:09:24 +02:00
aMannus
02d0b354a1
Copied over files from old branch
...
Dev merge made it so I couldn't easily merge into the old branch, so this is the next best thing.
2022-07-19 13:09:24 +02:00
Christopher Leggett
32abe61554
Implements a basic CreateMessage function for non-GetItem text.
2022-07-19 00:31:37 -04:00
Andrew Van Caem
edfa369639
Add yShift position when displaying the positions of cylinders ( #823 )
2022-07-18 19:31:52 -04:00
PurpleHato
9118788149
ADD: SaveEditor Edit current D-Pad Item ( #799 )
...
* ADD: Dapd on "current Dpad equip
* TWEAK: Spelling
* TWEAK: Shows it only if gDpadEquips is enable
* TWEAK: Forgot one "D-pad"
* TWEAK: Spacing
2022-07-18 19:24:56 -04:00
briaguya
d45968270a
Address rando pr comments ( #742 )
...
* prefix randomizer methods with Randomizer_
* make filename a local var
* remove unused file, update malon to use new names
* move randomizertypes to randomizer directory
* rename to Randomizer_GetSettingValue
Co-authored-by: briaguya <briaguya@alice>
2022-07-18 19:20:07 -04:00
aMannus
3a11aa08bb
Added v1 ice traps and fixed some tokens
2022-07-18 23:55:44 +02:00
aMannus
3341c3d404
Another batch of spooders
2022-07-18 11:08:35 +02:00
aMannus
06c3c2ba67
Fixed mistake
2022-07-18 09:10:36 +02:00
Christopher Leggett
e04b2c80b6
Implements the custom text for gInjectSkulltulaCount.
...
Also auto-dissmisses the textbox when gSkulltulaFreeze is on. When gInjectSkulltulaCount is off, text is not auto-dismissed just like before, since that is base game text still.
2022-07-17 22:02:22 -04:00
Christopher Leggett
1ed45e1433
Implements adding message tables and retrieving by an ID.
...
Basically, some external code can choos a unique id and create a message table for itself. The idea is that modders can hook into this as well so they can get their own message table and don't have to worry about conflicting with the base game's textIDs. I have also implemented this setup for Randomizer so that the pre-filled bottles (which didn't exist in the original outside of Ruto's letter) have unique text as compared to the text for the item they are filled with.
2022-07-17 21:03:32 -04:00
aMannus
0da14603e2
Freeze fix/first batch of skull actors
2022-07-17 23:50:48 +02:00
Christopher Leggett
ee1270f346
more cleanup
2022-07-17 15:29:02 -04:00
Christopher Leggett
98c771cf2c
Simplifies the function signature of CustomMessage_RetrieveIfExists.
2022-07-17 15:11:16 -04:00
Christopher Leggett
69d2b5b3a3
Implements function to return custom message if one exists.
...
`CustomMessage_RetrieveIfExists` is placed at the very beginning of the z_message_PAL.c `Message_OpenText` if statement after any special changes to textIds are made. This function will either return either true or false and if true it will populate the necessary values of font and msgCtx to display said message. It's placement at the beginning also allows for overriding existing textIds to have new information, which will come in handy later.
2022-07-17 15:02:08 -04:00
