Commit Graph

245 Commits

Author SHA1 Message Date
Garrett Cox
64965ee926 Use GiveItemEntryFromActorWithFixedRange in item00 2022-08-15 22:22:47 -05:00
Garrett Cox
d0d567697b Fix logical errors and migrate most of the rest of the rando checks to GiveItemEntryFromActor 2022-08-15 22:10:31 -05:00
Garrett Cox
170b297a7a Introduce some new methods and migrate most actors to them 2022-08-15 14:33:29 -05:00
Garrett Cox
06b1074e2a Replace Randomizer_GetRandomizedItemId with Randomizer_GetRandomizedItem and Randomizer_GetItemIdFromKnownCheck with Randomizer_GetItemFromKnownCheck 2022-08-15 12:10:35 -05:00
Christopher Leggett
6b4f300eda
Makes sure we aren't using getItemEntry when not randoed. 2022-08-15 02:17:06 -04:00
Christopher Leggett
9c59624d64
Makes freestanding items set player->getItemEntry.
This prevents freestanding items from setting the global modIndex.
This is part of a larger transition that needs to happen to switch
to setting getItemEntries for all of the rando items. This prevents
some things that set getItemId of GI_MAX from granting a Fire Medallion
when the global modIndex is MOD_RANDOMIZER.
2022-08-15 02:08:32 -04:00
Christopher Leggett
5998dcff7a
Simplifies sram init for rando-specific items 2022-08-13 23:27:03 -04:00
Christopher Leggett
6c3fff7412
Fixes Link's Pocket items. 2022-08-13 22:56:46 -04:00
Christopher Leggett
76282830d3
Fixes LACS/Prelude situation... again. 2022-08-13 15:30:18 -04:00
Christopher Leggett
58c9f64a16
Extends GetItemEntry to include GID.
This allows for using it later when drawing freestanding items.

Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r943168136
2022-08-13 01:44:19 -04:00
Christopher Leggett
11db45eef6
Extends GetItemEntry to include getItemId
Also adapts some existing calls for both the entry and the id to only
get the entry.
2022-08-13 01:32:36 -04:00
Christopher Leggett
69086f58c2
Cleanup, bugfixes, removing the - 1s from z_player.c 2022-08-13 00:22:34 -04:00
Christopher Leggett
0431dce989
Removes now unused ItemIDs and GetItemIDs
Also makes all the necessary changes to other code that was still
using them indirectly through the GI to GID map that was removed.
There's quite a lot of changes here and I haven't had time to test them
yet.
2022-08-11 02:01:01 -04:00
Christopher Leggett
cb81023255
Renames, relocates, and implements ModIndex enum. 2022-08-11 00:38:28 -04:00
Christopher Leggett
17c9ce7804
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into get-item-rework 2022-08-10 20:23:27 -04:00
briaguya
317de33a8b Merge branch 'develop-rachael' into rachael-to-zhora 2022-08-08 21:43:04 -04:00
briaguya
fa090c51f6
Merge pull request #831 from leggettc18/custom-messages
System for Creating and Storing Custom Messages
2022-08-08 21:24:48 -04:00
aMannus
4ea7f8371f
Rando: Zelda sequence fixes (#1095)
* Fixed zelda sequence oddities

* Fixed code inconsistency

* Adressed review comments

* Adressed review comments, removed unneccesary entrance skip

* Addressed some more review comments

* tiny cleanup
2022-08-08 19:59:06 -04:00
Dog
1f5d323d89
Randomizer: Skip Cutscenes (#846)
* Skip Jabu Jabu's fishy feeding time if rando is enabled Issue #757

Also skip the ganon tower fall cutscene if you died to ganon during the ganon fight for issue #773

* Immediately give control back to player when talon running cutscene starts.

* Fix case of not skipping Gannon
2022-08-08 19:48:53 -04:00
Christopher Leggett
59baf24dc6
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into custom-messages 2022-08-08 19:46:09 -04:00
Christopher Leggett
7516725f13
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into get-item-rework 2022-08-07 16:24:59 -04:00
Christopher Leggett
0efb008213
Partially fixes Ice Traps
Obtaining a freestanding Ice Trap causes link to slide forward
and receiving one from an NPC plays the sound effect and damage
animation but doesn't freeze link.
2022-08-07 13:17:06 -04:00
Christopher Leggett
75aaefaf04
Fixed Particle effects in the new getItem system. 2022-08-07 11:35:37 -04:00
Christopher Leggett
3258fc5fb3
Correctly renders freestanding items
Particle effects are probably broken, need to fix them still, I pretty
much know how I would do that.
2022-08-06 23:29:28 -04:00
Christopher Leggett
cfce0eba3d
Implements fixes for competing getItem calls. 2022-08-06 22:51:15 -04:00
GaryOderNichts
cb2410d9c5 Handle audio thread properly 2022-08-06 21:52:42 -04:00
Christopher Leggett
ba160cf997
merge in develop-zhora 2022-08-06 12:26:38 -04:00
Josh Bodner
c23457d666
Automatically save after every scene transition (#984)
* Automatically save after every scene transition

* Refactor and don't save in grottos

* Don't save in cutscenes

* Save after getting items as well

* Fix paren
2022-08-05 00:15:49 -04:00
Christopher Leggett
95d439bb30
Adds rough ability to differentiate between rando and vanilla items.merge stashed changes from before develop-zhora merge 2022-08-04 20:54:51 -04:00
briaguya
facd1723f8
don't use signed ints for epochs (#1044)
Co-authored-by: briaguya <briaguya@alice>
2022-08-04 17:32:23 -04:00
briaguya
739434e3e4 Merge branch 'develop-rachael' into rachael-to-zhora 2022-08-03 23:01:11 -04:00
vaguerant
78ad282056
Fix Navi HUD text regression (#1020)
* Fix Navi HUD text regression

* Fix the fix
2022-08-03 22:47:54 -04:00
Kenix3
0f7a88bd5a
This should fix (all?) 60fps interpolation issues left. (#938)
* This should fix (all?) 60fps interpolation issues left.

Resolves #631 #917

* Update z_fishing.c

* Re-adds Emil's interpolation in certain places.

* move open/close disps out of if statments checking timer based vars, revert fishing to use recordopen/closed child

* move disps out of ifs for morpha

* use recordopen/recordclose for volv

* recordopen/recordclose for ganondorf

* switch back to recordopen/recordclose for ganondorf floor

* Frame interpolation now uses a 64bit parameter rather than 32.

* More 60fps fixes

* Fix close child typo

* add todo calls to recordopen/recordclose

* fix build

* revert long long frame interpolation

* add some epochs

* add more epochs

* bongo epochs

* the rest of the epochs

* fix the typo fix the build

* interpolation fixes pr cleanup

* init/cleanup bongo epochs

* bongo hand trails

* Fixes niw feathers

* Fixes bongo bongo hands, and replaces epoch * i with epoch + i

* don't update epochs

Co-authored-by: briaguya <briaguya@alice>
2022-08-03 22:36:13 -04:00
Kenix3
fd379896d6 LUS Cleanup: Clean up hooks system. 2022-08-03 21:12:51 -04:00
Garrett Cox
6d0d608e38
Unrestricted warping in randomizer (#951) 2022-08-02 23:51:07 -04:00
Nycz
db33604171
added Cheat Sync Time (#957)
* added Cheat Sync Time

This syncs the ingame time with the real world time.
I wasnt quite sure where to put the code so im sorry if this is bad i just wanted to contribute to this project.

* Update soh/src/code/z_play.c

Co-authored-by: Christopher Leggett <chris@leggett.dev>

* Update z_play.c

added suggestions from leggettc18

* Update z_play.c

Co-authored-by: Christopher Leggett <chris@leggett.dev>
2022-08-02 23:48:41 -04:00
InfoManiac742
27e0f19dac
Remember save location (#980)
* Remember save location

* Clarified grotto caveat

* Update ImGuiImpl.cpp
2022-08-02 23:47:57 -04:00
aMannus
b89cc25df3
Fixed deku stick on B and horse swordless (#995) 2022-08-02 23:46:39 -04:00
Christopher Leggett
a007bfd14a
Merge changes from develop-zhora 2022-08-02 19:17:08 -04:00
Christopher Leggett
7eba85c3b4
Prevents blocking Song of Time check by shielding. (#1001) 2022-08-02 18:09:53 -04:00
David Chavez
53229f0905 Merge branch 'develop-rachael' into rachael-zhora
# Conflicts:
#	libultraship/libultraship/ImGuiImpl.cpp
2022-08-02 20:05:40 +02:00
Josh Bodner
18013e1ae0 Do this in Rachael instead 2022-08-02 13:57:34 -04:00
Garrett Cox
9389ceb8c1
Speed up lifting silver rocks and obelisks by 5x (#953)
* Speed up lifting silver rocks and obelisks by 3x

* Increase rock lifting speed to 5x

* Fix bug that sped up picking up small rocks, grass, bombflowers

* Add enhancement checkbox for faster block lifting and reduced speed to 3x
2022-07-31 22:09:30 -04:00
Christopher Leggett
b59c9cdf02
Randomizer: Fixes LACS and Prelude checks under certain conditions (#961)
* Prevents LACS flag from getting set when it shouldn't be.

* Fixes Prelude and LACS checks so they apply immediately if missed.

* Refactors the scene-flag-setting code into its own function.

* Renames new enums and props to be clearer and not specific to scene flags.

* Refactors pendingFlag data into a separate struct.
2022-07-31 21:57:30 -04:00
Kenix3
4f29833476
Adds beta quest Gameshark cheat. (#975)
* Adds beta quest Gameshark cheat.

* Fixes issue where lus was including a function from soh.

* Limits beta quest to 0-8
2022-07-31 21:52:10 -04:00
Garrett Cox
d648c7275c
Hide Dpad in minimal UI (#955) 2022-07-31 21:51:36 -04:00
David Chavez
582f084973
Use tex sizes from texture rather than hardcoded values (#610)
* Use tex sizes from texture rather than hardcoded values

* Dynamic do action tex sizes

* Remove unused minimap texture keys

* Restore MESSAGE_STATIC_TEX_SIZE

* Use dynamic offsets

* MACRO it up

* Enable SPDLOG in Xcode

* Handle non-existent texture
2022-07-31 21:32:40 -04:00
Nicholas Estelami
0193489b00 RGBA8 CVar Support Added 2022-07-31 16:57:04 -04:00
aMannus
fa0a66695c
Skips time travel cutscene in rando (#956) 2022-07-27 22:18:27 -04:00
GaryOderNichts
6818247317
Big-endian support (#909) 2022-07-27 23:50:56 +02:00