mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,071 Commits 3 Branches 36 Tags 132 MiB
Commit Graph

118 Commits

Author SHA1 Message Date
Christopher Leggett 0604dbfef8
Cleans up and updates item fanfares. 2022-08-14 11:43:25 -04:00
Christopher Leggett c8d085cb49
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next 
Hopefully everything works here. Need to do some testing.
 2022-08-13 22:43:19 -04:00
Christopher Leggett 9940c9ed28
Fixes too many arguments error. 
Not sure why this didn't fail to build on Windows before.
 2022-08-13 16:38:33 -04:00
Christopher Leggett 76282830d3
Fixes LACS/Prelude situation... again. 2022-08-13 15:30:18 -04:00
Christopher Leggett 9ed7feb30a
Realized I had the bgm conditions wrong. 2022-08-13 12:13:46 -04:00
Christopher Leggett 0c334615b6
Adds else if to added fanfare sound cases. 
Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r940112924 and https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r940113492
 2022-08-13 00:38:09 -04:00
Christopher Leggett 69086f58c2
Cleanup, bugfixes, removing the `- 1`s 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 4787f2f98b
Removes some commented out code. 2022-08-10 21:00:52 -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
Garrett Cox 3472e83250 Use new custom message system, skulltula drops still broken text 2022-08-09 00:00:30 -05:00
Garrett Cox e8c4378d17 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-08 22:47:29 -05:00
briaguya 8410a79b26
Merge branch 'rando-next' into zhora-to-next 2022-08-08 22:27:04 -04:00
briaguya 816fac6c06 Merge branch 'develop-zhora' into zhora-to-next 2022-08-08 22:23:06 -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
Christopher Leggett e63d84bd7d
Adapts this branch for cmake building. 2022-08-08 21:14:29 -04:00
lilDavid f80ba4102a
Add instant boomerang recall (#1006) 2022-08-08 19:55:07 -04:00
Garrett Cox 8f55dd0624 Add support for shuffling maps and compasses 2022-08-08 14:07:02 -05:00
Christopher Leggett 58da0a5aa2
Some more partial ice trap fixing that wasn't pushed earlier 2022-08-07 17:19:26 -04:00
Garrett Cox 8b59466ce5 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-07 15:41:44 -05:00
Garrett Cox ec801530b7 Move some more items around, boss keys still broken 2022-08-07 14:32:54 -05: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 9616058952
Fixes item fanfares 2022-08-07 12:14:07 -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
briaguya 46c3541458 seems to be working, still needs cleanup 2022-08-06 18:07:16 -04:00
briaguya 5574442fdc fix ganon's boss key 2022-08-06 04:30:03 -04:00
Garrett Cox 4a78375c8f And like magic, keysanity working :D 2022-08-05 23:08:46 -05: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
Christopher Leggett 1da655adb5
Resolve merge conflicts with develop-zhora 2022-08-03 23:13:53 -04:00
Christopher Leggett a007bfd14a
Merge changes from develop-zhora 2022-08-02 19:17:08 -04:00
briaguya ac776ce7bc Merge branch 'develop-zhora' into zhornext 2022-08-02 15:49:59 -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
briaguya d1ddc2a0c3 Merge branch 'develop-zhora' into zhora-to-rnext-merge 2022-08-02 13:02:13 -04:00
briaguya 412264050a
Merge pull request #746 from Sarge-117/rando-quest-item-fanfares 
Rando: Item Fanfares
 2022-08-02 03:24:36 -07:00
Christopher Leggett eae97cff79
Addresses most of bria's comments. 2022-08-01 21:44:28 -04:00
Christopher Leggett bfdf814a1f
Implements new getItem table in game. 2022-08-01 21:03:58 -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
vaguerant 361a986b8e
Add bottle swipes to Fast Drops; rename to Skip Pickup Messages (#847) 
* Add bottle-swipes to Fast Drops; rename to Fast Pickups

* More freecam friendly

* Resolve freecam interaction

* Rename to "Skip Pickup Messages"
 2022-07-31 21:37:47 -04:00
Sarge-117 9f41ea0ab4 Move function to code_800EC960.c 
Moved Audio_PlayFanfare_Rando to a better home
 2022-07-27 18:14:26 -07:00
Sarge-117 4e2da51c54 Code cleanup 
Some optimizations per suggestions
 2022-07-27 17:21:09 -07:00
Sarge-117 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
Christopher Leggett 5a97e9f0de
Factors away some raw textIDs into an enum with descriptive names. 2022-07-26 20:11:17 -04:00
briaguya a611197fab
Merge pull request #936 from briaguya-ai/develop-zhora 
zhora -> rando-next
 2022-07-25 20:52:51 -04:00
vaguerant 62f56a4791 Bug fix: Water Temple gate & bootcommands.c cleanup (#618) 
* Vanilla bug fix: child Water Temple gate

* Clean up bootcommands.c
 2022-07-25 19:07:32 -04:00
earthcrafterman 3a9dd95abc 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-25 19:06:06 -04:00
lilDavid 4a15e113f7 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-25 19:06:05 -04:00
vaguerant 1160fb2b15 Controller option: Navi on L (#861) 2022-07-25 19:06:05 -04:00