Commit Graph

182 Commits

Author SHA1 Message Date
Sarge-117
6c72d39f79
Remove comment border
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
2022-07-24 11:01:57 -07:00
Sarge-117
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
Sarge-117
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
Sarge-117
5505d0d284
Merge pull request #6 from Sarge-117/rando-next
Rando next
2022-07-22 23:35:22 -07:00
Sarge-117
77eeeb9c81
Merge branch 'HarbourMasters:develop-zhora' into rando-quest-item-fanfares 2022-07-21 22:52:14 -07: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
earthcrafterman
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
briaguya
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
lilDavid
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
vaguerant
059045481c
Controller option: Navi on L (#861) 2022-07-22 01:21:18 +02:00
Sarge-117
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
Baoulettes
c19beca980
Fast Save Loader crashes fixes (#848) 2022-07-22 00:36:46 +02:00
briaguya
dfa929a16f
Reset var for shadow boss key room spike walls (#860) 2022-07-22 00:31:26 +02:00
Christopher Leggett
880e3928cf
Fixes odd rando interaction with malon after receiving her check. (#867) 2022-07-22 00:28:43 +02:00
Jeffrey Crowell
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
aMannus
8f89b969cb Tiny code cleanup 2022-07-21 12:25:16 +02:00
aMannus
9ce552659a Changed iceTrapped var name/type and tooltip 2022-07-21 12:22:36 +02:00
aMannus
37134cbc9a Fixed ice traps (maybe actually this time) 2022-07-21 08:30:48 +02:00
aMannus
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
aMannus
0cc59a9370 Fix for spooders to overwroote each ooder 2022-07-20 17:15:22 +02:00
aMannus
36d451eb85 Add setting tooltip and fixed an oopsie 2022-07-20 14:07:01 +02:00
aMannus
69de5ac14a Fixed all possible ice trap scenarios 2022-07-19 22:29:52 +02:00
aMannus
27ac523b14 Fix after dev merge 2022-07-19 16:47:49 +02:00
aMannus
75ab2f7780 Removed temporary bunny hood change 2022-07-19 13:36:12 +02:00
aMannus
51dae73387 Merge branch 'develop-zhora' into spoopy-spiders 2022-07-19 13:33:45 +02:00
Sarge-117
d9f4314f5c Undo accidental commit
I'm a dummy and accidentally committed changes from other branches I was working on.
2022-07-18 19:01:47 -07:00
Sarge-117
3ab3e962d3
Merge branch 'test' into rando-quest-item-fanfares 2022-07-18 18:50:13 -07:00
Sarge-117
cb1b725cda Shorten code
Shortened the code
2022-07-18 18:39:24 -07:00
Sarge-117
2133fe97dd
Merge branch 'HarbourMasters:develop' into test 2022-07-18 16:48:29 -07:00
Sarge-117
b4291516b6
Merge branch 'HarbourMasters:develop' into rando-quest-item-fanfares 2022-07-18 16:48:01 -07:00
Christopher Leggett
169f757954
Fixes ice trap chests to have short chest animations (#817) 2022-07-18 19:31:04 -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
Sarge-117
486c129fb4
Merge pull request #4 from Sarge-117/fix-broken-knife-inventory-icon
Fix broken knife inventory icon
2022-07-18 15:00:42 -07:00
aMannus
3a11aa08bb Added v1 ice traps and fixed some tokens 2022-07-18 23:55:44 +02:00
Sarge-117
3de4e955db 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.
2022-07-18 14:44:55 -07:00
aMannus
3341c3d404 Another batch of spooders 2022-07-18 11:08:35 +02:00
aMannus
3b747b41be Cleanup and freeze fix
Don't freeze the player when the skulltula token check is something else than a token. Also some cleanup and declaring variables more globally within z_en_si.c
2022-07-18 09:05:32 +02:00
aMannus
0da14603e2 Freeze fix/first batch of skull actors 2022-07-17 23:50:48 +02:00
Sarge-117
65de2a6ecd
Merge pull request #3 from Sarge-117/Allow-Equipment-Toggle
Allow equipment toggle
2022-07-17 10:05:55 -07:00
aMannus
4ccd4d5895 Exposed static table to change skulltokens
This static table is normally only used within z_player.c, but is needed to switch the itemId to something Item_Give() can use and to set the correct TextId.
2022-07-17 16:02:27 +02:00
Sarge-117
efe3294f1c Set up Cvar and check for MS
Set up the cvar/imgui and add a check that we own the Master Sword (in case we're in the Ganon fight)
2022-07-16 10:10:34 -07:00
aMannus
0f1f8c15f2 Closer but not yet 2022-07-16 12:20:53 +02:00
Sarge-117
cf0b68c572 Allow Equipment Toggle
Allow player to toggle equipment on/off on the equipment subscreen.  For tunics and boots, this will revert them to Kokiri Tunic/Kokiri Boots.  For shields, it will un-equip the shield entirely.  For swords, only BGS/Giant's Knife is affected, and it will revert to Master Sword.
2022-07-16 00:24:38 -07:00
aMannus
ac099018e4 still nothing yet 2022-07-15 14:56:52 +02:00
Sarge-117
e60053500d
Merge branch 'HarbourMasters:develop' into rando-quest-item-fanfares 2022-07-14 09:49:46 -07:00
KiritoDev
219804cbe4
Controller Configuration UI and JSON Config (#760)
* Initial controller hud ui

* Reverted fbdemo changes

* Moved config to json and implemented controller config

* fix build on linux, gitignore new config file

* fix build

* Fix compilation and file directory paths

* Call save on cvar save

* Fixed cvar loading and added deck slots to the config

* Changed control deck port 0 to use a physical device by default

* Added gyro and rumble & fixed loading errors

* Save config on toggle menubar

* fix linux build

* Fixed drift calculation

* Controller config now saves when pressing F1

* Removed ExitGame hook from ImGuiImpl

* Moved mappings to a map

* Added GetKeyName

* untranslate scancodes

* Fixed hud layout on keyboard device

* Fixed keyboard read on hud

* Fixed crash when reloading controllers

* Removed ConfigFile and changed file extension

* Changed Dummy to Disconnected and fixed filters

* Removed function leftover

* Changed ControllerHud to InputEditor

Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: David Chavez <david@dcvz.io>
2022-07-13 23:12:11 -04:00
briaguya
cb6876792e
don't spawn blocking mido after we've already shown him the sword/shield (#675)
Co-authored-by: briaguya <briaguya@alice>
2022-07-13 22:04:48 -04:00
aMannus
f7db8868d0
Skip warp song cutscenes in rando (#664)
Does it by skipping to the last part of the cutscene data. Tested on all songs, both adult and child.
2022-07-13 22:04:19 -04:00
Sarge-117
fa1327553d Fix syntax
I think the !=0 is needed
2022-07-13 15:12:44 -07:00