mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-11 20:15:07 -05:00
Code Issues Projects Releases Wiki Activity
1,297 Commits 3 Branches 37 Tags 142 MiB
61b6d162e8
Commit Graph

951 Commits

Author SHA1 Message Date
Christopher Leggett
a57d935996
Fixes a few more freestanding items that weren't covered. 2022-08-14 22:10:40 -04:00
Christopher Leggett
c7388c39d8
Prevents Skulltulas from affecting other nearby checks. 2022-08-14 21:56:12 -04:00
Christopher Leggett
5d293ff4d1
Merge branch 'get-item-rework' into get-item-rework-rando-next 2022-08-14 21:30:12 -04:00
Christopher Leggett
f4a051fb90
Should re-fix freestanding ice traps 2022-08-14 21:28:54 -04:00
Christopher Leggett
0e2530cd49
Fixes Ruto's Letter. 
It was accidentally getting classified as a rando item.
 2022-08-14 20:43:59 -04:00
Christopher Leggett
7e0e8c63af
Fixes issues with approaching bottleable items. 2022-08-14 20:43:45 -04:00
Christopher Leggett
76f25c18c0
Fixes Ruto's Letter. 
It was accidentally getting classified as a rando item.
 2022-08-14 20:15:33 -04:00
Christopher Leggett
202805531f
Fixes issues with approaching bottleable items. 2022-08-14 18:40:48 -04:00
Christopher Leggett
d541ea3b39
Another Skulltula Ice Trap fix. 2022-08-14 18:25:09 -04:00
aMannus
8842d1ec0d Fixed newline end of file 2022-08-14 23:12:00 +02:00
aMannus
5f1c365a0c Eliminated copy pasta 2022-08-14 23:11:11 +02:00
Christopher Leggett
3f55409bee
Should fix Skulltula Ice Traps. 2022-08-14 14:57:00 -04:00
Christopher Leggett
e451d13e2b
Some more changes to account for Skulltulas in new system. 2022-08-14 14:17:55 -04:00
Christopher Leggett
3bf92a348c
Fixes crashes with Audio_PlayFanfare_Rando. 2022-08-14 13:19:41 -04:00
Sarge-117
fa19df9201 Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips 2022-08-14 10:16:35 -07:00
Christopher Leggett
203785f76a
Fixes Link's Pocket being a Dungeon Reward from Impa. 2022-08-14 12:22:24 -04:00
Christopher Leggett
6d7498829d
Wraps up a few missed type changes. 2022-08-14 11:54:43 -04:00
Christopher Leggett
0604dbfef8
Cleans up and updates item fanfares. 2022-08-14 11:43:25 -04:00
Christopher Leggett
1ab4b23011
Should fix some Skulltula oddities. 2022-08-14 11:26:00 -04:00
Christopher Leggett
baa17dda27
Fixes build error for Windows and Mac 2022-08-14 01:32:31 -04:00
Christopher Leggett
f7707a3890
Merge branch 'get-item-rework' into get-item-rework-rando-next 2022-08-14 01:02:12 -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
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
7cef38a70a
Fixes "static drops" (i.e. sticks from withered babas) 2022-08-13 13:05:50 -04:00
Christopher Leggett
9ed7feb30a
Realized I had the bgm conditions wrong. 2022-08-13 12:13:46 -04:00
Christopher Leggett
105eac4e53
Sets global modIndex to MOD_NONE on scene load 
Fixes a crash when buying items in shops due to them
not triggering the rando code that normally sets these items.
May have also been crashing vanilla playthroughs.
 2022-08-13 11:49:03 -04:00
Christopher Leggett
d167f4a263
Rando-specific items use new textId again. 
This got lost when merging develop-zhora in because I didn't have custom
messages merged when I started this.
 2022-08-13 11:47:12 -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
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
briaguya
f70c1ff88a
Merge pull request #1160 from aMannus/rando-better-dupe-handling 
Rando: Added more items to have dupe handling
 2022-08-13 00:30:12 -04:00
Christopher Leggett
4cc492f383
Fixes some funky formatting that got committed earlier. 2022-08-13 00:28:19 -04:00
Christopher Leggett
69086f58c2
Cleanup, bugfixes, removing the - 1s from z_player.c 2022-08-13 00:22:34 -04:00
briaguya
8c965b4dc7
Merge pull request #1171 from aMannus/item-tracker-improvements 
Item tracker improvements
 2022-08-12 23:39:00 -04:00
lilDavid
92d0d3e35e Let Cojiro crow in Adult Trade Shuffle 2022-08-12 17:12:52 -05:00
lilDavid
e9354cc9a1 Don't spawn Fado and the carpenter's son at once 2022-08-12 17:12:19 -05:00
lilDavid
282192eb5e Properly hatch pocket cucco using Sun's Song 2022-08-12 17:02:03 -05:00
aMannus
4c9f2493d7 Brought CVar naming in line with others 2022-08-12 22:51:40 +02:00
lilDavid
947a97608c Save Editor Adult Trade Shuffle bugfixes: 
- Having multiple items with the collapsing header open rapidly cycles trade items
 - Unchecking any item's checkbox cycles the trade item (it should only do so if it's the one you've selected)
 - Setting the adult trade slot sets the wrong items' flags
 - Emptying the adult trade slot doesn't reset all trade items' flags
 2022-08-12 15:43:08 -05:00
aMannus
3689abd01f One more small code cleanup 2022-08-12 22:39:12 +02:00
aMannus
5f2bcb39c9 Small code cleanup 2022-08-12 22:16:23 +02:00
aMannus
4d7982911e More fixes and code cleanup 2022-08-12 22:08:10 +02:00
aMannus
ff64bc42fb First pass fixes item tracker save loading 2022-08-12 18:21:28 +02:00
aMannus
aa7380fe06 Added missing double defense 2022-08-12 13:14:15 +02:00
Christopher Leggett
2077636c92
Inverts CheckContainsRandoItem to CheckContainsVanillaItem. 
Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r940895135
 2022-08-11 21:39:30 -04:00
Christopher Leggett
e1084c0d6d
Removes ARRAY_SIZE in favor of ARRAY_COUNT 
ARRAY_COUNT already exists in `macros.h`, I just didn't find it before.

Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r943153833
 2022-08-11 21:24:03 -04:00
Christopher Leggett
4b7548e998
Throws exception if an invalid itemID is used 
Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r943694857
 2022-08-11 21:16:39 -04:00
Kenix3
86faa42acf Make libultra OSContPad struct consistent with the one from libultraship 2022-08-11 19:41:53 -04:00
Kenix3
094388187f Cleans up Controllers 
Renames VirtualController to DummyController.
Makes controller axis treated the same as buttons.
Made Controller class members private or protected
Made Controller class treat deadzones, sensitivities, and press thresholds consistently.
 2022-08-11 19:41:53 -04:00
Christopher Leggett
e9c193146c
Removes commented out function. 2022-08-11 12:32:09 -04:00
Christopher Leggett
929f196ac8
Re-implements GIMESSAGE_UNTRANSLATED as macro 2022-08-11 12:29:47 -04:00
aMannus
1e36de19aa Added more duplicate item handling 2022-08-11 11:57:43 +02:00
briaguya
5156ccbfd5
Merge pull request #1154 from aMannus/maps-compasses-name-change 
Rando: Small fixes for "Maps/Compasses"
 2022-08-11 04:17:21 -04:00
aMannus
e7c793df9b Fixed comment too 2022-08-11 08:57:18 +02:00
aMannus
ac70d92b31 Changed maps/compasses location in UI 2022-08-11 08:55:29 +02:00
aMannus
67edf574f2 Rename maps/compasses 2022-08-11 08:35:37 +02:00
briaguya
388319deac add kak gate check for mask select 2022-08-11 02:01:25 -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
briaguya
2af572aa30 add check for mask shop being open to mask select 2022-08-11 01:51:43 -04:00
briaguya
b03d23f61f
Merge pull request #1152 from briaguya-ai/develop-zhora 
zhora -> rando-next
 2022-08-11 01:36:05 -04:00
Christopher Leggett
cb81023255
Renames, relocates, and implements ModIndex enum. 2022-08-11 00:38:28 -04:00
Christopher Leggett
cdd4628d7a
Refactors rando's GetItemEntry array into two arrays. 
One array is for the vanilla items that don't have GetItemEntries in
vanilla, the other is for rando exclusive items. They are stored in
separate arrays before getting added to the table so that we can apply
different modIndexes. The items in the first table have are handled
by the vanilla Item_Give, and the second table needed a custom
`Randomizer_Item_Give` function.
 2022-08-11 00:24:34 -04:00
briaguya
7ea210aa63
Merge pull request #1147 from PurpleHato/RandoItemTrackerV2 
FIX: Rando Item Tracker non initialized small key were not transparent
 2022-08-10 22:30:49 -04:00
PurpleHato
9ccc7908fa FIX: Rando Item Tracker non initialized small key were not transparent 2022-08-11 04:21:28 +02:00
briaguya
85ad427b99
Merge pull request #1141 from aMannus/rando-gerudo-bridge-fix 
Rando: Fix gerudo card incorrectly given to link when bridge is open
 2022-08-10 21:44:49 -04:00
briaguya
23b2ed7bee
Merge pull request #1146 from PurpleHato/KeysanityTranslation 
ADD: French Translation for Rando Custom Messages
 2022-08-10 21:25:28 -04:00
PurpleHato
d73ab42641 ADD: French Translation for Rando Custom Messages 2022-08-11 03:02:36 +02:00
Christopher Leggett
4787f2f98b
Removes some commented out code. 2022-08-10 21:00:52 -04:00
Christopher Leggett
dcb8e21314
Replaces ::find with ::at and adds exception handling 2022-08-10 20:57:47 -04:00
briaguya
9d7df7c102
Merge pull request #1139 from aMannus/rando-dont-skip-useful-cutscenes 
Rando: Add "Enable Glitch-Useful Cutscenes" option
 2022-08-10 20:30:01 -04:00
Christopher Leggett
6e37897449
Removes unused function override 2022-08-10 20:28:44 -04:00
briaguya
ddfa85b533
Merge pull request #1143 from PurpleHato/RandoItemTrackerV2 
FIX: Key Tracker showing -1 and always transparent small keys
 2022-08-10 20:23:27 -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
PurpleHato
212bf936f0 FIX: Key Tracker showing -1 and always transparent small keys 
TWEAK: also disabled notes properly this time
 2022-08-11 00:05:58 +02:00
aMannus
1947278fdf Fixes gerudo card bug with open bridge 2022-08-10 23:14:31 +02:00
aMannus
36dd0f669e Fixed woopsie 2022-08-10 21:54:16 +02:00
aMannus
e259e87588 ADD: Enable Glitch-Useful Cutscenes option to rando 2022-08-10 21:51:10 +02:00
Sarge-117
0f6e7ede48 Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips 2022-08-10 11:15:37 -07:00
Sarge-117
af03a80ad3 Create const "NaviMsgCount" 
So the number of messages doesn't have to be changed in 3 places when adding new entries
 2022-08-10 11:06:38 -07:00
briaguya
aba8da5257
Merge pull request #1137 from lilDavid/fix_trade_shuffle_save_editor 
Fix adult trade shuffle in save editor
 2022-08-10 12:36:32 -04:00
lilDavid
fc08229a46 Save editor: Link adult trade item slot and flags 2022-08-10 11:00:49 -05:00
briaguya
d74220d3ac don't give link's pocket garbage 2022-08-10 11:55:47 -04:00
briaguya
f5d7955547 ensure itemlocations is big enough for every check 2022-08-10 11:39:10 -04:00
briaguya
d535d0be9a make array big enough for all the checks 2022-08-10 11:21:10 -04:00
briaguya
d523ba5127 complete mask quest 2022-08-10 06:28:10 -04:00
briaguya
c04548f98f initialize icon size on item tracker 2022-08-10 04:32:08 -04:00
briaguya
65356b6ced
Merge pull request #1051 from garrettjoecox/keysanity 
Keysanity + Shuffle Compasses & Maps
 2022-08-10 02:28:14 -04:00
Garrett Cox
7f62802aef Man I really had to split that up into three commits.. Fix from removing LACS setting 2022-08-10 01:19:21 -05:00
Garrett Cox
8abfa4821f Anotha one (removing LACS stuff) 2022-08-10 01:17:19 -05:00
Garrett Cox
ec7e3d350a Remove LACS settings for ganons key for now 2022-08-10 01:15:00 -05:00
briaguya
e766d00812
Merge pull request #1073 from lilDavid/trade_quest_shuffle 
Add adult trade quest shuffle
 2022-08-10 01:59:19 -04:00
briaguya
3509327a5c
Merge pull request #1119 from PurpleHato/RandoItemTrackerV2 
Rando item tracker v2
 2022-08-10 01:49:04 -04:00
Kenix3
81cd594704 Console now exposes commands with a reference to itself. 2022-08-10 00:38:56 -04:00
Sarge-117
e2ff584839 Add remaining tips 
All the sample hints are now working under the new message system
 2022-08-09 20:13:39 -07:00
briaguya
0c4add7e0b
Merge pull request #1125 from HarbourMasters/develop-zhora 
zhora -> rando-next to fix a crash
 2022-08-09 22:52:22 -04:00
briaguya
96c2033361
fix linux release mode crash (#1124) 
Co-authored-by: briaguya <briaguya@alice>
 2022-08-09 22:50:25 -04:00
Kenix3
5751b5c278 debugconsole now uses console output functions. 2022-08-09 22:34:16 -04:00
Kenix3
c7ccd6dbff LUS Cleanup: Strips out the logging system created for the console 
Properly routes SPDLog to the console.
Creates an API to be able to send command responses back to the console.
Cleans up the console UI, hiding options when not needed.
Removes stdout console sink for Windows.
 2022-08-09 22:34:16 -04:00
lilDavid
aef77a0913
Merge branch 'rando-next' into trade_quest_shuffle 2022-08-09 20:40:00 -05:00
Sarge-117
6de7ce3720
Delete z_message_RandoNaviTips.c 2022-08-09 18:37:42 -07:00
Sarge-117
3c4405347d Remove old stuff + add test messages 2022-08-09 18:35:39 -07:00
lilDavid
12d45685b9 Move files in with other rando files 2022-08-09 19:57:40 -05:00
Sarge-117
b4c9f4aa6e Test switch to new message system 
Testing setting up the table and calling the messages
 2022-08-09 16:07:58 -07:00
Sarge-117
6a39b9e011 Comments 2022-08-09 13:56:45 -07:00
Sarge-117
dc6018b41e Update CMakeLists.txt 2022-08-09 13:44:57 -07:00
Sarge-117
00e2d0fe0e Update tips 2022-08-09 12:39:59 -07:00
Sarge-117
d6210a2ebb
Merge branch 'rando-navi-tips' into rando-next 2022-08-09 12:25:54 -07:00
Sarge-117
f55623e1c6 Update z_message_PAL.c 2022-08-09 12:23:14 -07:00
PurpleHato
5c0939d4fd DEL: GTG disaplying a boss key 2022-08-09 19:00:44 +02:00
PurpleHato
fc9aaf7c25 DEL: Boss Key on BOTW and Boss/Small key on ICE Cavern 2022-08-09 18:53:53 +02:00
PurpleHato
4f1d667ec5 TWEAK: Uncessecary new line 2022-08-09 18:44:27 +02:00
PurpleHato
5bbce43f19 TWEAK: added back but disabled personal notes for now 2022-08-09 18:28:03 +02:00
PurpleHato
3f8b060fad TWEAK: Window posiiton 2022-08-09 17:59:52 +02:00
PurpleHato
fa393bff48 ADD: Item Tracker V2 2022-08-09 17:54:28 +02:00
lilDavid
08366c51b6 Correct mixed indentation styles 2022-08-09 10:17:38 -05:00
briaguya
1aeefa3c7e
Merge pull request #1111 from leggettc18/rando-skull-message-fix 
Fixes skulltula messages for custom items.
 2022-08-09 08:54:41 -04:00
Garrett Cox
608f493c5b Update descriptions and defaults 2022-08-09 07:53:15 -05:00
Christopher Leggett
7a5acb0a2a
Fixes placement 2022-08-09 08:36:20 -04:00
Christopher Leggett
20bbf85f00
Sets player getItemId before other messagebox instance. 2022-08-09 07:26:17 -04:00
aMannus
0b722eebd4 Merge branch 'develop-zhora' into zhora-rando-next-merge 2022-08-09 08:44:05 +02:00
aMannus
e4b58e5a0c
TWEAK: Layout/styling overhaul for the F1 menu (#1026) 
* First pass of UX changes

* More padding/styling/layout

* More styling

* Moar styling

* Some more styling

* Implemented padding helpers

* More styling, added closing buttons to windows

* Fixed merge conflict mistake

* Fixed new enhancements

* Hopefully fix jenkins errors

* Changed button behaviour, more styling

* Tiny code cleanup

* Change buttons from close/open to > when open

* Small button spacing fix

* Small styling changes after merge

* Small fix after merge mistake
 2022-08-09 02:16:45 -04:00
Christopher Leggett
6f7b38539b
Moves setting of getItemId into a rando save if block. 2022-08-09 01:56:47 -04:00
Christopher Leggett
95918e0cb2
Fixes skulltula messages for custom items. 2022-08-09 01:42:47 -04:00
Garrett Cox
bbce60e71c Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-09 00:01:46 -05: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
Christopher Leggett
b9e18519a2
Removes Skulltula text auto-dismiss in tokensanity 
More precisely, removes the auto-dimissal from the Skulltula
textbox when in a rando save and any token shuffle is on.
Bonus Fix: parses the Skullsanity setting from the spoilerfile,
which wasn't happening before.
 2022-08-08 23:40:02 -04:00
Christopher Leggett
ffc36efe50
Reimplements FOWL ice trap text boxes. 
They got lost in the custom-messages merge. Reimplemented them
in the custom-messages system.
 2022-08-08 23:11:45 -04: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
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
Christopher Leggett
e63d84bd7d
Adapts this branch for cmake building. 2022-08-08 21:14:29 -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
InfoManiac742
0e10b59307
Update z_kaleido_item.c (#1046) 2022-08-08 19:58:01 -04:00
InfoManiac742
4bf4ad3359
Update z_en_ru1.c (#1042) 2022-08-08 19:56:56 -04:00
lilDavid
f80ba4102a
Add instant boomerang recall (#1006) 2022-08-08 19:55:07 -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
Garrett Cox
a0ac945b4e Make logic consistent across z_parameter & z_sram 2022-08-08 14:18:15 -05:00
Garrett Cox
8f55dd0624 Add support for shuffling maps and compasses 2022-08-08 14:07:02 -05:00
Garrett Cox
cb97c2a205 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-08 12:08:06 -05:00
Garrett Cox
34b8d7d5f8 Handle impa giving a key if skip zelda is on 2022-08-08 11:09:06 -05:00
David Chavez
9afbe42720
Use -O2 for Release config builds (#1083) 2022-08-08 12:01:45 +02:00
briaguya
f8f8e01039
Merge pull request #1088 from HarbourMasters/develop-zhora 
quick zhora to rando next
 2022-08-07 21:41:31 -04:00
lilDavid
46be24b595 Add missing semicolons and return values 2022-08-07 18:58:17 -05:00
Sarge-117
a5acf6da20 Set Navi timer back to normal 2022-08-07 16:33:44 -07:00
Sarge-117
48a41bd11c Comment clarity 2022-08-07 16:31:50 -07:00
Sarge-117
6e8b45d129 Fix text colours (Navi text is always light blue) 
Navi text should always be \x44
 2022-08-07 15:50:53 -07:00
Sarge-117
7144d1a321 First test of Rando-specific Navi tips 
First test of this experiment
 2022-08-07 15:26:03 -07:00
Garrett Cox
c8ac2d7c7e Finally found fix for boss keys... 2022-08-07 16:41:57 -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
01a36f525e Handle keys in checkObtainability 2022-08-07 15:41:30 -05: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
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
75aaefaf04
Fixed Particle effects in the new getItem system. 2022-08-07 11:35:37 -04:00
th-2021
e51e7f3d45
[cmake] Fix Switch icon (#1084) 
* Update CMakeLists.txt

* fix switch icon

* Update soh/CMakeLists.txt

* Update soh/CMakeLists.txt

Co-authored-by: David Chavez <david@dcvz.io>
 2022-08-07 16:47:16 +02:00
Garrett Cox
f7267be29a Change shuffle cows to checkbox and remove extra line 2022-08-07 02:10:54 -05:00
briaguya
cac6869a56
Merge pull request #1080 from HarbourMasters/develop-zhora 
zhora -> rando-next
 2022-08-07 02:16:11 -04:00
briaguya
91ad58aa3e
Merge pull request #1061 from garrettjoecox/frogSongs 
Shuffle frog song rupees
 2022-08-07 02:13:24 -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
Garrett Cox
ea9d76621c Fix issue with keysanity values not loading from spoiler file 2022-08-06 22:01:55 -05: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
briaguya
c3253fe59f add comment explaining ocarina mode setting 2022-08-06 18:23:47 -04:00
briaguya
0eb8f5c95f remove commented out lines 2022-08-06 18:15:24 -04:00
briaguya
e0d6445f24 remove unused cow stuff 2022-08-06 18:14:01 -04:00
briaguya
46c3541458 seems to be working, still needs cleanup 2022-08-06 18:07:16 -04:00
Garrett Cox
ea909b748e Add super basic custom messages for keysanity, not pretty... 2022-08-06 16:51:58 -05:00
lilDavid
f885195fc9 Apply trade item timer disabling consistently 2022-08-06 16:01:29 -05:00
lilDavid
7cfe21f865 Fix non-randomizer carpenter's son despawning 2022-08-06 15:58:57 -05:00
lilDavid
c8289f5946 Skip lines in Adult Trade Shuffle description 2022-08-06 15:38:32 -05:00
th-2021
7ef3fff869
add soh icon for Windows (#1060) 2022-08-06 22:19:06 +02:00
lilDavid
8ee597298c Change cursor sound and add files to build system 2022-08-06 15:01:35 -05:00
Christopher Leggett
194c4f4e52
Adds new files to CMakeLists. 2022-08-06 15:54:19 -04:00
Garrett Cox
8aba2b6323 Merge branch 'keysanity' of github.com:garrettjoecox/Shipwright into keysanity 2022-08-06 14:18:50 -05:00
Garrett Cox
77f2e56039 Support starts with and more options on ganons boss key 2022-08-06 14:07:46 -05:00
lilDavid
f41b939a71 Only show adult trade items in the save editor if they're shuffled 2022-08-06 12:58:21 -05:00
lilDavid
6603a9a474 Add adult trade shuffle to randomizer 2022-08-06 12:58:08 -05:00
Christopher Leggett
ba160cf997
merge in develop-zhora 2022-08-06 12:26:38 -04:00
Christopher Leggett
9062eaaca5
Should fix switch build pt 2 2022-08-06 12:21:11 -04:00
Christopher Leggett
43461cec69
Should fix switch build 2022-08-06 12:15:27 -04:00
briaguya
5574442fdc fix ganon's boss key 2022-08-06 04:30:03 -04:00
Garrett Cox
e274530073 Fix cows giving free bottles, too generous 2022-08-06 03:03:11 -05:00
Garrett Cox
b420638267 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-06 00:48:55 -05:00
Garrett Cox
5346217af3 Misc fixes 2022-08-06 00:29:05 -05:00
Garrett Cox
2d9d67bbd0 Add missing case 2022-08-05 23:44:53 -05:00
Garrett Cox
cc4300ef8b Revert accidental changes 2022-08-05 23:40:43 -05:00
briaguya
61c88386a1 Merge branch 'develop-zhora' into zhora-to-next 2022-08-06 00:26:50 -04:00
Garrett Cox
733ce5d28f Use scene enum, handle thieves hideout keys 2022-08-05 23:26:50 -05:00
Garrett Cox
4a78375c8f And like magic, keysanity working :D 2022-08-05 23:08:46 -05:00
briaguya
97d363c91e
Merge pull request #1019 from garrettjoecox/shuffleCows 
Add shuffleCows options for randomizer
 2022-08-06 00:03:27 -04:00
Garrett Cox
9a145221ec Remove newline 2022-08-05 21:02:02 -05:00
Garrett Cox
de34fd7e94 Check coords for other cows rather than falling back 2022-08-05 16:11:17 -05:00