briaguya
4f109178ff
Merge branch 'develop-flynn' into flynn-to-dev
2022-12-06 21:29:27 -05:00
Adam Bird
d9f3844b2d
[Feature] Entrance Rando v2 ( #2071 )
2022-12-07 00:37:50 +01:00
PurpleHato
7f4a19461c
ADD: Rando German Custom Messages ( #2102 )
...
* ADD: Rando German Custom Messages
Thanks to Timmy_GamerNepgear on Discord for the translation, I basically just formatted the text
* TWEAK: Forgot a small breakline
2022-12-06 22:54:54 +01:00
briaguya
3921f15264
use enum for boss keysanity ( #2096 )
...
* use enum for boss keysanity
* merge
Co-authored-by: briaguya <briaguya@alice>
2022-12-06 01:03:55 -05:00
briaguya
767b707a8c
use enum for keyrings ( #2095 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-12-06 01:00:36 -05:00
briaguya
dbfdb42406
use enum for hint clarity ( #2092 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-12-06 01:00:24 -05:00
briaguya
541d1d35a4
use enum for shuffle scrubs ( #2089 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-12-06 01:00:12 -05:00
briaguya
ca4875befc
use enums for tokensanity ( #2088 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-12-06 00:59:59 -05:00
briaguya
a93728599d
use enum values for maps and compasses ( #2086 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-12-06 00:59:48 -05:00
briaguya
d03e876289
use enum for logic ( #2098 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-12-06 00:37:07 -05:00
briaguya
1e0e80f580
use enum for hint distribution ( #2093 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-12-06 00:36:28 -05:00
briaguya
8b96c023fb
use enum for gerudo keys ( #2094 )
...
* use enum for gerudo keys
* don't use cvar that doesn't exist
Co-authored-by: briaguya <briaguya@alice>
2022-12-06 00:36:13 -05:00
briaguya
52bf2d600b
use enum for gossip stone hints ( #2091 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-12-06 00:35:59 -05:00
briaguya
306183aa1b
use enum for shuffle merchants ( #2090 )
...
* use enum for shuffle merchants
* remove comment that isn't needed anymore
Co-authored-by: briaguya <briaguya@alice>
2022-12-06 00:35:44 -05:00
briaguya
22c4b1afa3
use enum for shuffle songs ( #2087 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-12-06 00:35:08 -05:00
briaguya
321e563c82
use enum for starting age ( #2085 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-12-06 00:34:30 -05:00
briaguya
acd07f2a07
add/use enum values for rando mq dungeon options ( #2056 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-12-06 00:32:53 -05:00
briaguya
8d398f7130
refactor: separate RandoOption enum, use max ( #2055 )
...
* refactor: separate RandoOption enum, use max
* missed a couple magic array sizes
* couple more
Co-authored-by: briaguya <briaguya@alice>
2022-11-30 01:40:55 -05:00
briaguya
d6c528d9d0
use shopsanity enum ( #2054 )
...
* enums for rainbow bridge
* reorder enum
* use enums for shopsanity
* remove space
Co-authored-by: briaguya <briaguya@alice>
2022-11-30 00:30:51 -05:00
briaguya
e193f0dc0e
enums for rainbow bridge ( #2052 )
...
* enums for rainbow bridge
* reorder enum
Co-authored-by: briaguya <briaguya@alice>
2022-11-29 23:41:46 -05:00
briaguya
00a862a252
use trial enum instead of magic numbers ( #2039 )
...
* use trial enum instead of magic numbers
* simplify trial count/random trial logic
* set default to set number
Co-authored-by: briaguya <briaguya@alice>
2022-11-29 22:43:05 -05:00
briaguya
06df45efc7
use forest enum values instead of magic numbers ( #2038 )
2022-11-30 02:32:22 +01:00
briaguya
17c6a3653c
use enum for keysanity ( #2044 )
2022-11-30 02:05:11 +01:00
briaguya
b976ef58fe
use enum for ganon's boss key ( #2046 )
2022-11-30 02:01:41 +01:00
briaguya
a15f89a3e4
Use enum values for ice trap setting ( #2041 )
...
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: David Chavez <david@dcvz.io>
2022-11-30 00:40:35 +01:00
briaguya
aba034ef53
Use enum for links pocket, dungeon reward shuffle ( #2045 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-11-30 00:37:53 +01:00
briaguya
ec8ec8d322
Use enum for kak gate ( #2043 )
...
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: David Chavez <david@dcvz.io>
2022-11-30 00:33:38 +01:00
briaguya
bfc0ca5388
Use enum values for item pool ( #2042 )
...
* use enum values for item pool
* Update soh/soh/Enhancements/presets.h
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2022-11-30 00:31:59 +01:00
briaguya
7e9c5d428c
Use gerudo fortress enum ( #2040 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-11-30 00:30:52 +01:00
Garrett Cox
d7c3522142
[docs] Upstream updates 1 ( #1955 )
...
* First round of upstream updates and commenting patternss
* Renames from z64player
* Renames from z64save
* Undo changes to legacy save struct
* Add missing reference from entrance rando
* Fixes from stat tracker
* More tweaks
2022-11-30 00:28:57 +01:00
PurpleHato
453eb7af88
Missing space ( #2024 )
2022-11-28 18:21:25 -05:00
briaguya
0424c5aaf3
fix: rando door of time enum usage ( #2032 )
2022-11-28 22:41:33 +01:00
Ralphie Morell
9cfe7bff47
Rando: Settings Enum ( #1761 )
...
* added rando option enum; added options to load from spoiler file
* whoops
* Moved to `randomizerTypes` header; fixed ammo drop enum
* Actually populated options with new enums
* Added add'l enums for ganon boss key
2022-11-22 17:11:05 -05:00
Garrett Cox
8461ea4abd
Add s6 and hellmode presets for rando ( #1904 )
...
* Refactor how presets are created and used, and add presets for rando
* Add new enhancements to clear
* Tweaks and feedback
2022-11-22 12:30:18 -05:00
aMannus
dcd9ca56e6
Keyrings count fix ( #1975 )
2022-11-18 13:03:26 -05:00
Garrett Cox
283854c854
Implement option to start with a specific number of skulltula tokens ( #1967 )
2022-11-16 01:39:53 -05:00
Adam Bird
15a9975200
Entrance Rando ( #1760 )
2022-11-14 12:13:21 +01:00
briaguya
3914781ebf
Import libultraship as a submodule ( #1943 )
...
Co-authored-by: briaguya <briaguya>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: David Chavez <davi@dcvz.io>
2022-11-14 11:22:34 +01:00
Ralphie Morell
341bc43daf
Rando: Shuffle Merchants ( #1720 )
2022-11-08 19:54:51 +01:00
Garrett Cox
92b1730237
[ #1931 ] Fix issue with ZF Gossip stones ( #1933 )
2022-11-07 14:14:24 -05:00
briaguya
498769c990
Remove colons from shopsanity messages ( #1881 ) ( #1887 )
...
Co-authored-by: lilDavid <1337lilDavid@gmail.com>
2022-11-06 05:36:07 -05:00
PurpleHato
710a768d76
TWEAK: Some forgotten colors + google translation rewrite ( #1919 )
2022-11-05 16:09:03 -04:00
Garrett Cox
763f3a5760
Tweaks to chest matches contents setting ( #1902 )
2022-11-03 18:07:11 -04:00
Garrett Cox
fab52d323b
Implement hint for dungeon type on Map get item messages ( #1852 )
...
* Implement hint for dungeon type on Map get item messages
* Color dungeon name in item tracker when MQ and map is found
* No hint when all dungeons are MQ or non MQ
* TWEAK: French hint
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
2022-11-02 12:03:26 -04:00
Christopher Leggett
fd8a2c9483
Adds in-game menu for selecting a dungeon quest/randomizer ( #1863 )
...
* Adds most visuals and interactions for quest select menu.
* "Scrolling" menu, adds remaining sub/title textures, language support
* Tweak: ENG, FRA, GER title to match the original style
* ADD: Randomizer tex
* TWEAK: Randomizer ZAPD extension format
* Adds control stick prompts to the "scrolling" menu.
* Adds third entry for Randomizer.
* Bold text on randomizer subtitle.
* Ensures the game won't allow selecting an unsupported quest.
* Makes save files be created from the quest menu selection.
* Removes the master quest and randomizer checkboxes (no longer needed).
* Removes lock on MQ-only rando.
* Skips quest select if only one quest is playable.
* Adds ability to back out of quest select menu
* Show seed icons while Randomizer is selected on Quest Select Menu.
* Fixes custom hud colors and d-pad navigation.
* Implements backing up from name entry to quest select.
Also implements backwards rotations on the file select screen.
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
2022-11-02 11:50:47 -04:00
Garrett Cox
dda4a13bc3
Implement keyrings ( #1869 )
...
* Implement keyrings
* ADD: French GIMessage
* Remove cvar include
* Rename maxKeys to numOfKeysOnKeyring
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
2022-11-02 11:36:02 -04:00
Adam Bird
57c1f4dce2
Fix rando save creation crash due to corrupted hint text ( #1846 )
2022-11-02 14:37:44 +01:00
Garrett Cox
0389c8084c
Cleanup some of our uses of custom messages ( #1847 )
...
* Cleanup some of our uses of custom messages
* Fix some string escape warnings
2022-10-25 21:24:48 -04:00
Christopher Leggett
e2a9461005
Fixes saving `isMasterQuest` and fixes default values for rando sliders. ( #1833 )
...
* Fixes saving `isMasterQuest` and fixes default values for rando sliders.
* Changed slider default values
* Fixes default dropdown values for Ganon Trials and MQ Dungeons.
* Ensure's consistent default values are used for all `CVar_GetS32`'s
2022-10-23 14:32:35 -04:00
Christopher Leggett
6fe7728bd1
Fixes a crash on Switch and cleans up some rando ui interactions. ( #1832 )
2022-10-22 12:31:20 -04:00