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
4ee0ddaa15
use enum for language ( #2097 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-12-06 00:36:53 -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
aMannus
d3bfc102fe
[Fix} Small Crowd Control fixes ( #2061 )
2022-12-06 06:28:50 +01:00
Amaro Martínez
1a9898b918
Fix Ganondorf title card ( #2082 )
2022-12-05 14:38:28 -05:00
frizzle101101
da1aa270ad
making edit and continue compiling in vs possible ( #1988 )
...
* making edit and continue compiling in vs possible
* fix tab spacing
2022-12-04 23:25:24 -05:00
Josh Bodner
656dcd2021
Don't autosave after obtaining bombchus if bombchu drops are enabled ( #2077 )
2022-12-04 20:54:23 -05:00
Josh Bodner
39b80137f6
Don't autosave in the Chamber of Sages ( #2076 )
2022-12-04 20:13:29 -05:00
aMannus
5d2b794c00
Fix hookshot retraction on dpad ( #2065 )
2022-12-04 19:27:15 -05:00
aMannus
5b5310ea92
Disable bunny hood NPC interactions with MM bunny hood on ( #2058 )
...
* Disable bunny hood NPC interactions
* Enum
2022-12-04 19:03:04 -05:00
aMannus
d4aeb79341
Fix jabu skulltula check ( #2062 )
2022-11-30 10:13:00 -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
3cb9f93ff4
[docs] Pull upstream updates: SetupDL ( #2048 )
2022-11-30 00:29:36 +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
5037b99740
rename 3drando dot enums to match soh enum naming ( #2034 )
2022-11-28 23:49:21 +01:00
Ada
9027d85671
TWEAK: Game controls menu simplification ( #2007 )
2022-11-28 23:45:07 +01:00
briaguya
0424c5aaf3
fix: rando door of time enum usage ( #2032 )
2022-11-28 22:41:33 +01:00
briaguya
97e612b921
flynn -> dev
...
flynn -> dev
2022-11-28 15:59:00 -05:00
Garrett Cox
091b6a2987
[Fix] Issue with first two rainbow bridge settings getting swapped ( #2023 )
...
Fixes #2022
2022-11-26 19:39:45 +01:00
briaguya
1bf5fb64a5
[Fix] Dodongo boss battle crashing with only mq otr ( #2020 )
...
Co-authored-by: briaguya <briaguya>
2022-11-26 08:19:33 +01:00
PurpleHato
80bb4577b0
Google Translation Strikes back ( #2014 )
2022-11-24 13:17:47 -05:00
sonoftunk
bd54ac5d15
Removes duplicated rando option enum for merchant ( #2008 )
2022-11-23 21:05:48 -05:00
Sarge-117
67e325a0b9
Fix C-button counts and ice trap count ( #2009 )
2022-11-23 20:53:10 -05:00
frizzle101101
d65718db85
fix int sliders to fill the window like float sliders ( #1984 )
...
* fix int sliders to fill the window like float sliders
* add a spacer to make it consistent with float slider
* add a spacer to make it consistent with float slider
* adding pop width further constancy with float slider
2022-11-23 16:14:11 -05:00
Oliver Schall
4526550e95
[Enhancement] Added checkbox to disable finishing difficulty behavior changes ( #1990 )
2022-11-23 13:43:06 +01:00
sonoftunk
c3f51fef2a
[Format] Lines up checks in item_location ( #2004 )
2022-11-23 13:42:14 +01:00
Sarge-117
9c162fc0ec
Gameplay Stat Tracker V1 ( #1986 )
...
* First test of gathering some gameplay stats
* timer changes and other stuff
* Move code to new files + rename
* Name change - gamePlayStats
* Finish rename, remove n64ddFlag checks
* Improve item get times
* Better time tracking, more stats,
* Put button under Enhancements
* Fix merge conflict
* Add pauseCount, fix bug with rando items
* Adjust inits/declarations
* step counter
* Name change: "itemGetTime" to "timestamp"
* Tidying + CI test
* Set up array for stat counts
* Macro
#define GAMEPLAYSTAT_TOTAL_TIME (gSaveContext.gameplayStats.playTimer / 2 + gSaveContext.gameplayStats.pauseTimer / 3)
* Add boss defeat timestamps
* Add sword swings, pots broken, bushes cut
* fix int type
* Add counts for enemies defeated
Broken down by enemy, with a total
* Add ammo used
* Hide breakdowns until count > 0
* Forgot Big Octo
* Count chests opened
* Update after LUS submodule
* Enemy count spacing
* Comments
* Count 3 mini Floormasters as 1 Floormaster
+ some cleanup
* Comments
* Colour coding for timestamps on quest items
i.e. medallions/stones/songs
* Move stat into the sohStats struct
+ rearrange the counts enum for easier addition of future counts
* Some documentation + count button presses
* Stop counting button presses when Ganon defeated
* Couple bugfixes
Add count for Gerudo Thief, fix step counter counting in some situations where it shouldn't
* Fix comment
2022-11-22 20:04:40 -05: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
Amaro Martínez
0fca1019a2
Do not use Yes/No hardcoded options for Better Owl ( #2002 )
2022-11-22 14:23:48 -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
Alto1772
156f713e19
[Enhancement] Add option to hide build details on boot screen ( #1948 )
2022-11-22 09:42:01 +01:00
DeusVexus
b843937b34
[Fix] Rando: Like Likes should not eat tunics ( #1978 )
2022-11-22 09:30:12 +01:00
DeusVexus
1ae4e2c1f7
[Enhancement] Include minigame ammo in infinite ammo cheat ( #1973 )
2022-11-22 09:18:23 +01:00
Adam Bird
c87f066848
[Fix] Allow turning in Ruto's letter after rescuing her ( #1999 )
2022-11-22 09:17:51 +01:00
briaguya
15eb293e61
[Fix] Create MQ saves when only MQ OTR loaded ( #2001 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-11-22 08:59:27 +01:00
frizzle101101
c569a46933
[Enhancement] Add fix camera drift option to fixes menu ( #1983 )
2022-11-22 08:57:26 +01:00
Oliver Schall
8841e0b607
Fixed Shooting Gallery Difficulty Menu implementation issues ( #1991 )
2022-11-22 00:53:23 +01:00
GaryOderNichts
5dcc7e41b9
Display all game versions in build info ( #1982 )
2022-11-20 20:13:54 +01:00
Oliver Schall
82fff6486c
Shooting gallery difficulty options menu ( #1354 )
...
* Added difficulty settings menu for shooting gallery
* Reverted linux assert fix for PR
* Added difficulty option to not randomize rupee order as adult
* Changed checkbox wording due to text overflow
* Reverted incorrect change from merge
* Update soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
* Added Checkbox to turn on and off all customizations in shooting gallery behavior
* Added disable-switch for sliders, shooting gallery difficulty options are now disabled when customize behavior is turned off instead of hidden
Co-authored-by: Ralphie Morell <rafael.morell@techfield.us>
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2022-11-18 18:55:22 -05:00
Josh Bodner
2c0ec96eff
Fix credits timing ( #1254 )
...
* Fix credits timing
* Add documentation
* Fix typo
2022-11-18 18:42:58 -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
adb1365200
add a toggle for multi viewports in imgui ( #1896 )
2022-11-15 01:02:48 -05:00
briaguya
c9a3dcdb44
update lus ( #1965 )
...
* update lus
* rename things to fix build
Co-authored-by: briaguya <briaguya@alice>
2022-11-14 23:01:06 -05:00
Josh Bodner
e7597bae30
Prevent autosave when first loading a file ( #1792 )
2022-11-14 20:02:07 -05:00
briaguya
8571545bf2
Cheat: Switch Age and Reload Link ( #1963 )
...
* Added button to switch age
* Added logic to switch link's age
Reloads link from last entrance he went through once his age is switched.
* Link now respawns where he last was
* Update game.c
* move setting to GameMenuBar.cpp, fix build issues
Co-authored-by: Jake Edvenson <77412657+JakeEdvenson@users.noreply.github.com>
Co-authored-by: briaguya <briaguya@alice>
2022-11-14 19:29:16 -05:00
RaelCappra
6361a4c776
Fixes most known bugs associated with FreeCam ( #1960 )
...
* Fixes most known bugs associated with FreeCam
Co-authored-by: MelonSpeedruns <melonspeedruns@outlook.com>
* Address review suggestions
Co-authored-by: MelonSpeedruns <melonspeedruns@outlook.com>
2022-11-14 17:59:17 -05:00
Adam Bird
15a9975200
Entrance Rando ( #1760 )
2022-11-14 12:13:21 +01:00
Alto1772
8be2c4ddd7
Audio & Rendering backend option greyed out if theres only one ( #1958 )
2022-11-14 12:09:13 +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
PurpleHato
f050ba9ff7
TWEAK: Fix corrupted characters on French gossip hint ( #1935 )
2022-11-07 16:41:33 -05:00
Garrett Cox
92b1730237
[ #1931 ] Fix issue with ZF Gossip stones ( #1933 )
2022-11-07 14:14:24 -05:00
lilDavid
e170407517
Enhancements for equipping magic arrows ( #1022 )
...
Skip Magic Arrow Equip Animation, Equip Multiple Arrows at Once
2022-11-07 09:05:56 +01:00
RaelCappra
8d57ef4bed
Restore QPA glitched damage ( #1789 )
2022-11-07 09:02:42 +01:00
Dakota Brown
328ff0e8c4
Added Chests of Agony ( #1885 )
2022-11-06 22:07:58 +01: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
David Chavez
e6e7a7b549
Refactor CrowdControl Setup ( #1890 )
2022-11-06 11:00:34 +01:00
blackgamma7
be72f48cea
Expanded Save Editor for Fishing Minigame ( #1900 )
2022-11-06 10:59:33 +01:00
Garrett Cox
2f6dea92c7
Add option to disable jump velocity boost with bunny hood ( #1918 )
2022-11-06 10:05:34 +01:00
Garrett Cox
99260acaf1
Use PlayState instead of GlobalContext ( #1927 )
...
* Use PlayState instead of GlobalContext
- GlobalContext -> PlayState
- globalCtx -> play
- GlobalCtx -> PlayState
- globalContext -> playState
* Find and replace Gameplay_ with Play_
* Correct some misnamed argument cases
2022-11-06 09:24:34 +01:00
PurpleHato
710a768d76
TWEAK: Some forgotten colors + google translation rewrite ( #1919 )
2022-11-05 16:09:03 -04:00
briaguya
274a108167
fix: add ShouldAdvanceSilent
to functions.h
( #1920 )
...
The implicit declaration was causing issues on Linux when building in release mode. The call was getting optimized out which was preventing the "equip now?" message box from functioning as intended. Adding the `Message_ShouldAdvanceSilent` declaration to `functions.h`resolves the issue.
2022-11-05 15:33:04 -04:00
Garrett Cox
4396411d10
Add enhancement for making nuts explode bombs, similar to bombchus ( #1906 )
2022-11-05 14:37:32 +01:00
Garrett Cox
6d10e6b9f8
[rando] Pull gamestabled/OoT3D_Randomizer #540 fixes ( #1917 )
2022-11-05 14:31:25 +01:00
Garrett Cox
d77e810aae
Always show GTG & Ganons castle MQ status on tracker ( #1913 )
2022-11-05 03:11:04 -04:00
Garrett Cox
1dc28978fe
Fix copy/paste for ganons castle keyring ( #1916 )
2022-11-05 03:00:34 -04:00
Garrett Cox
dc758739f4
Add missing randomizer inf flags to save editor ( #1909 )
2022-11-05 01:57:36 -04:00
Garrett Cox
960c2732e5
Skip cutscenes for DOT and Rainbow bridge in rando ( #1908 )
2022-11-04 21:47:13 -04:00
Garrett Cox
a40b7180d9
handle keyrings on sohStats ( #1911 )
2022-11-04 21:37:16 -04:00
Garrett Cox
763f3a5760
Tweaks to chest matches contents setting ( #1902 )
2022-11-03 18:07:11 -04:00
Garrett Cox
a4697c6fcb
Change lineup tick default to off ( #1899 )
2022-11-03 12:55:40 -04:00
Christopher Leggett
75af33a04c
Fixes choose-quest with missing MQ crash. ( #1903 )
2022-11-03 12:29:25 -04:00
Garrett Cox
c5940905e7
Add glitch line-up tick option ( #1875 )
2022-11-02 22:07:10 -04:00
Christopher Leggett
4156a1d2c7
Fixes bug preventing name entry with single OTR. ( #1894 )
2022-11-02 18:00:57 -04:00
Christopher Leggett
d49a1cd6b3
Fixes bug with generating seed on the choose-quest screen. ( #1892 )
2022-11-02 17:30:44 -04:00