0c6ed553a2
Shorten code by calling new function
...
Reduced duplicate code by calling the new Audio_PlayFanfare_Rando function from z_player.c
2022-07-26 18:14:28 -07:00
c6cd0f5e03
Fix special case with the "WINNER" heart
...
The "WINNER" heart is its own unique item rather than just another piece of heart, so it needed its own check to make it consistent with other pieces of heart
2022-07-25 12:43:36 -07:00
5ad90bf71b
Change cvar name for accuracy
...
Changed Cvar from "gRandoFanfareByItemType" to "gRandoQuestItemFanfares" for better accuracy
2022-07-24 12:51:55 -07:00
6c72d39f79
Remove comment border
...
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com >
2022-07-24 11:01:57 -07:00
70e4f216ed
Account for boomerang/hookshot tokens
...
Fixed the case where you get the token via the boomerang or hookshot. Done by separating out the code into its own function and then calling it in the two appropriate spots.
2022-07-24 00:53:37 -07:00
068f3426d7
Account for tokensanity
...
Added changes to restore small item fanfares to rupees, heart containers, and items when picked up from skulltulas in tokensanity.
2022-07-23 23:25:35 -07:00
5505d0d284
Merge pull request #6 from Sarge-117/rando-next
...
Rando next
2022-07-22 23:35:22 -07:00
77eeeb9c81
Merge branch 'HarbourMasters:develop-zhora' into rando-quest-item-fanfares
2022-07-21 22:52:14 -07:00
cab9499a76
Merge pull request #338 from HarbourMasters/develop-zhora
...
zhora -> rando-next
2022-07-21 21:05:35 -04:00
b3d3148383
Merge branch 'develop-rachael' into develop-zhora
2022-07-22 02:34:55 +02:00
2ad78887b9
Added a time saver option to allow players to instantly put items away ( #600 )
...
* Added a time saver option to allow players to instantly put items away
Expanded the range of damage multiplication to 80 (20 hearts of damage for each quarter heart) so players can play a sudden death challenge
* The damage sliders are now comboboxes
Damage multiplication is now exponential instead of incremental
The FPS slider is now a text input
* Splitting into solely being a quick putaway PR
* Removed some leftover code from the split
2022-07-22 02:31:49 +02:00
1ca12feaed
Adds Xcode project ( #769 )
...
* Add Xcode project
Add dynamic lib paths
Generate resources scripts
Fix after rebase
tweak targets
Set min deployment target
* remove project
* readd project with correct gitignore
2022-07-21 20:15:45 -04:00
84236e7ac3
stop floor under shadow statue opening immediately ( #857 )
...
* stop floor under shadow statue opening immediately
* use ActorResetFunc to reset sStatueRotY
Co-authored-by: briaguya <briaguya@alice>
2022-07-22 02:11:13 +02:00
27d37e9d00
fix dot song Only vs only issue
2022-07-21 20:06:19 -04:00
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
c7c16c39b0
Add fixes for power crouch stab to the Enhancements menu ( #874 )
...
* Add optional fixes for power crouch stab
* Add line break in "Fix Megaton Hammer" tooltip
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com >
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com >
2022-07-22 01:22:09 +02:00
059045481c
Controller option: Navi on L ( #861 )
2022-07-22 01:21:18 +02:00
44dbd3a8a9
Fixes naming discrepancy of textbox positions. ( #854 )
...
Equivalent to https://github.com/zeldaret/oot/pull/1329
2022-07-22 01:13:04 +02:00
52f22275e3
Fix Giant's Knife unexpected behaviours ( #834 )
...
* Giant's Knife Behaviour Fixes
Fixes a case where Giant's Knife (specifically, breaking and re-buying it) can behave unexpectedly if you don't have a Kokiri Sword in your inventory. Also fixes the broken icon not showing up in inventory after you break it.
* less whitespace
* fix 0xE check
Accidentally committed with the wrong check
* Move the grayscale code up
Moved the grayscaling portion up higher in the function and renamed "bool not_acquired" to "bool age_restricted". Thanks to @vaguerant for the suggestion!
2022-07-22 00:39:04 +02:00
c19beca980
Fast Save Loader crashes fixes ( #848 )
2022-07-22 00:36:46 +02:00
eb49053e73
Prevent unrestricted items camera crash ( #852 )
2022-07-22 00:35:30 +02:00
e41873fff4
Savestate crash fix on Ubuntu ( #843 )
2022-07-22 00:34:04 +02:00
dfa929a16f
Reset var for shadow boss key room spike walls ( #860 )
2022-07-22 00:31:26 +02:00
880e3928cf
Fixes odd rando interaction with malon after receiving her check. ( #867 )
2022-07-22 00:28:43 +02:00
41d1bbe137
Fix nullptr dereference in morpha ( #870 )
...
reported on discord, i don't have the ability to reproduce this, but it
appears to be a benign fix, as the only time that the tent2 is checked
down later is guarded by a null check.
2022-07-22 00:27:44 +02:00
1d208c7dc2
Revert to using boolean in json
2022-07-21 11:04:37 -07:00
2edc81ee2d
Attempt to restore formatting of randomizer.cpp
2022-07-21 11:03:28 -07:00
6f082e1769
Fixed rename breaking maps/compasses
2022-07-21 17:32:28 +02:00
8f89b969cb
Tiny code cleanup
2022-07-21 12:25:16 +02:00
9ce552659a
Changed iceTrapped var name/type and tooltip
2022-07-21 12:22:36 +02:00
37134cbc9a
Fixed ice traps (maybe actually this time)
2022-07-21 08:30:48 +02:00
2c5bdbfd4b
Merge branch 'rando-next' into spoopy-spiders
2022-07-21 08:30:31 +02:00
cddca2700a
Move Child Zelda spoiler write out of for loop so it's not repeatedly hit
2022-07-20 23:08:57 -07:00
17b3f65276
Fix the issue for real
2022-07-20 22:57:18 -07:00
75a4d2cf99
Actually use the same strings everywhere lol
2022-07-20 21:50:55 -07:00
795ee54f2b
Remove use of std::format since Jenkins doesn't like it
2022-07-20 21:44:32 -07:00
1944b68d19
fix starting inventory
2022-07-20 23:36:39 -04:00
3633bdeeaf
Fix Child Zelda Skip rando setting always on
2022-07-20 19:57:38 -07:00
a7936942b1
Fixes for double spiders & ice traps
...
getItemId should've been set earlier to make sure double spiders didn't screw up ice traps.
Additionally Item_Give() was still being called with skultulla tokens as the default value so it granted a token when picking up an ice trap.
Skulltula freeze was also happening on ice traps which it shouldn't do, so that's fixed now too.
2022-07-20 22:47:25 +02:00
0cc59a9370
Fix for spooders to overwroote each ooder
2022-07-20 17:15:22 +02:00
3be2dbd005
Added nighttime GS sun's song option
2022-07-20 14:33:12 +02:00
36d451eb85
Add setting tooltip and fixed an oopsie
2022-07-20 14:07:01 +02:00
715a4f7315
Added all remaining tokens(?)
2022-07-20 13:37:28 +02:00
5c25364eff
Nother batch of spooders
2022-07-20 11:56:03 +02:00
bee6fdb8ba
Small fix after UX merge
2022-07-20 11:04:01 +02:00
a4af34c8dc
Merge branch 'rando-next' into spoopy-spiders
2022-07-20 10:58:53 +02:00
bfd76dc244
Added comment
2022-07-19 23:20:05 +02:00
69de5ac14a
Fixed all possible ice trap scenarios
2022-07-19 22:29:52 +02:00
ceef852a9a
Merge branch 'HarbourMasters:develop-zhora' into rando-quest-item-fanfares
2022-07-19 10:56:20 -07:00
16e676d2d0
Removed some spaces that were missed
2022-07-19 16:57:54 +02:00
Sarge-117