aMannus
e500db810b
Code cleanup + more names
2022-08-18 13:55:59 +02:00
briaguya
a7d4aa8042
add areas to rcos
2022-08-18 07:37:24 -04:00
briaguya
289a6e5a82
start on RC object stuff
2022-08-18 06:15:02 -04:00
aMannus
a2243634cd
Rand(), option to disable, attempted fix special chars
2022-08-18 11:54:02 +02:00
Sarge-117
bb6135fd2b
Spacing
2022-08-17 22:07:51 -07:00
Christopher Leggett
7ee281182a
Replaces Zora's Sapphire with JabuJabu's Dungeon Reward.
...
Repalces the model for Zora's Sapphire with the Dungeon Reward for JabuJabu's Belly when you find it in the miniboss room.
2022-08-17 21:43:52 -04:00
PurpleHato
a1cc0da6d3
TWEAK: Forgot the array size
2022-08-18 00:39:15 +02:00
PurpleHato
cca32b7a43
ADD: Baguette money
2022-08-18 00:35:54 +02:00
aMannus
589f2be0f1
More names
2022-08-18 00:09:54 +02:00
aMannus
e25fcc645b
More names, fixed translations
2022-08-17 23:57:31 +02:00
aMannus
c1cec5a44a
First fully working implementation
2022-08-17 23:30:51 +02:00
aMannus
f9766fa4a6
Initial language support and setup for randomizing
2022-08-17 22:30:21 +02:00
Christopher Leggett
a51b844a23
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next
2022-08-17 15:43:42 -04:00
Sarge-117
d56e712d07
spacing
2022-08-17 11:27:17 -07:00
Sarge-117
584f9d16f0
Fix line break
2022-08-17 11:26:07 -07:00
Sarge-117
6862e400f5
Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips
2022-08-17 11:11:00 -07:00
Sarge-117
2c144c3aa6
Fix typo, fix Master Sword text
2022-08-17 11:10:37 -07:00
Sarge-117
907871915d
fix question mark
2022-08-17 11:07:03 -07:00
PurpleHato
3fb582a02b
ADD: BAGUETTE
2022-08-17 20:00:20 +02:00
Christopher Leggett
914af77234
Fixes fanfare getItemId overlap
2022-08-17 12:23:39 -04:00
briaguya
ae8c7cb509
add excluded locations set
2022-08-17 11:08:11 -04:00
briaguya
11cc040710
add rcs to itemlocations in 3drando
2022-08-17 10:45:33 -04:00
aMannus
55f71457d8
initial proof of concept
2022-08-17 16:45:19 +02:00
briaguya
5605542452
start playing with imgui filters
2022-08-17 09:03:27 -04:00
Christopher Leggett
525dcca499
Fixes some Sheik checks I had accidentally set the wrong flag for.
2022-08-17 01:07:28 -04:00
briaguya
c933d521c3
Merge pull request #1223 from leggettc18/rando-next-ganonbkhint-fix
...
Fix Ganon's Boss Key hints for Keysanity
2022-08-17 00:09:26 -04:00
briaguya
03151647b1
Merge pull request #1227 from HarbourMasters/develop-zhora
...
zhora -> rando-next
2022-08-16 23:59:11 -04:00
Kenix3
72981221ad
Merge pull request #1226 from HarbourMasters/develop-rachael
...
rachael -> zhora
2022-08-16 23:40:06 -04:00
Kenix3
f9621dcc17
Cleans up Window class.
2022-08-16 23:30:20 -04:00
Christopher Leggett
b6d6ede520
Fixes color replacement from being saved to the save file.
...
This was bad because replacing `%w` with `\x05\x00` was causing
the string to prematurely terminate.
2022-08-16 23:04:14 -04:00
Christopher Leggett
ecaf0fd87a
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into rando-next
2022-08-16 22:12:20 -04:00
Christopher Leggett
5a3ab9bcdc
Fixes Ganon's Boss Key hints for keysanity.
2022-08-16 22:12:06 -04:00
David Chavez
6b0338a37d
[zret] Port some documentation changes ( #1164 )
...
* zret: Documentation pass on scene/room commands #1226
* Update OTR scene
* zret: Document the lens system #1079
* zret: Misc. doc/cleanup 4 #1093
* zret: Fix misc 8 #1150
* zret: Document Distortions from z_camera and z_view #1102
2022-08-16 21:53:28 -04:00
briaguya
6206cd7db0
add ActorResetFunc for courtyard guards ( #1213 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-16 21:50:52 -04:00
briaguya
01b7fedc35
clean up a few epochs that were missed ( #1204 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-16 21:50:37 -04:00
briaguya
71b1db1fb6
volvagia interpolation fix ( #1203 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-16 21:50:12 -04:00
Christopher Leggett
1184a35480
Fixes OoT rendering and Ice Trap checks.
2022-08-16 21:22:14 -04:00
Christopher Leggett
269a66656a
Fixes Zora's River Frog checks.
2022-08-16 20:58:11 -04:00
Christopher Leggett
3bc67ef1eb
Fixes chests by allowing for negative getItemIds
2022-08-16 20:28:24 -04:00
aMannus
cd37a56161
Rando: Fix being able to get Sun's Song check multiple times ( #1185 )
2022-08-16 22:16:44 +02:00
Josh Bodner
eb632ccb50
Adjustable push speed ( #1190 )
2022-08-16 22:09:11 +02:00
Christopher Leggett
0f2e7db8e0
Fix Ice Traps on Windows and Mac ( #1216 )
2022-08-16 21:49:52 +02:00
GaryOderNichts
a3d0962054
Fix ocarina right stick controls ( #1211 )
2022-08-16 13:47:41 +02:00
lilDavid
46a421f933
Add window to customize specific controls ( #1122 )
2022-08-16 09:43:09 +02:00
th-2021
b46c7a0607
[cmake] Use SDL2, GLEW and GLFW from vcpkg (Windows) ( #1194 )
2022-08-16 09:29:45 +02:00
Christopher Leggett
1ef08a7325
Merge get-item-rework and update new checks.
2022-08-16 01:11:51 -04:00
Christopher Leggett
cc31479772
Merge branch 'get-item-rework' into get-item-rework-rando-next
2022-08-16 00:43:17 -04:00
Christopher Leggett
9916d3cc01
Additional fix for Skull Kid
2022-08-16 00:32:02 -04:00
Christopher Leggett
38363fb015
Merge branch 'get-item-rework-help1' of github.com:garrettjoecox/Shipwright into pr/garrettjoecox/2
2022-08-16 00:12:44 -04:00
Garrett Cox
f874d83432
Add a few missing cases
2022-08-15 22:59:42 -05:00
Christopher Leggett
9fcd39290c
Merge branch 'get-item-rework-help1' of github.com:garrettjoecox/Shipwright into pr/garrettjoecox/2
2022-08-15 23:28:34 -04:00
Christopher Leggett
5d01a71797
Fixes Anju to set player->getItemEntry.
2022-08-15 23:28:08 -04:00
Garrett Cox
64965ee926
Use GiveItemEntryFromActorWithFixedRange in item00
2022-08-15 22:22:47 -05:00
Christopher Leggett
d06b17f871
Merge branch 'get-item-rework-help1' of github.com:garrettjoecox/Shipwright into pr/garrettjoecox/2
2022-08-15 23:10:58 -04: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
Christopher Leggett
881529c7bf
Sets z_en_box.c to set player->getItemEntry
2022-08-15 23:08:31 -04:00
Christopher Leggett
f8b55ea78c
Fixes ocarina game skull kids to set player->getItemEntry
2022-08-15 22:46:52 -04:00
briaguya
ee9ea3f2bd
add 3drando license ( #1206 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-15 21:17:58 -04:00
Sarge-117
4be473fede
Add German translations
...
Thanks to Menzelmeister on Discord for translating to German
2022-08-15 14:02:48 -07:00
Garrett Cox
170b297a7a
Introduce some new methods and migrate most actors to them
2022-08-15 14:33:29 -05:00
Garrett Cox
806019d0cb
Move check for gRandoQuestItemFanfares into MOD_NONE block within Audio_PlayFanfare_Rando
2022-08-15 12:48:57 -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
bff5406e69
Merge branch 'get-item-rework' into get-item-rework-rando-next
2022-08-15 02:36:29 -04: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
briaguya
42bce9d33e
don't abuse epochs ( #1179 )
...
* don't abuse epochs
* update bongo hand trails
Co-authored-by: briaguya <briaguya@alice>
2022-08-14 23:18:12 -04:00
aMannus
fabe051d3d
Fix lost woods leading music in rando ( #1155 )
2022-08-14 23:04:40 -04:00
Julien Lemay
8945b2ed48
Fix Save Editor Event Check Inf "A" Row flags ( #1138 )
...
Fix Save Editor Event Check Inf Flags "A" Row flags not working. It was set to "eci1" instead of "eci10".
2022-08-14 23:02:14 -04:00
aMannus
d575a3dda6
Fixed rotation of freestanding key checks in rando ( #1135 )
2022-08-14 23:01:30 -04:00
aMannus
37dd045bd2
Rando: Fix bomb/bombchu shops ( #1134 )
...
* Fix bomb shops in rando
* Addressed review comments
2022-08-14 23:01:00 -04:00
GaryOderNichts
68e7f2e6c1
Wii U support ( #1097 )
...
* Wii U support
* [WiiU] Combined Dockerfile
* [WiiU] Combined Dockerfile
* [WiiU] Combined Dockerfile
* Add Jenkins support
* wiiu: fix scissor clamp
* wiiu: improve button remapping
* wiiu: fix scaling issues
* Update Dockerfile after merge
* Pull assets before build
* Only stop container once
* Adjust logging sinks
* wiiu: Change button mapping to match PC version
* wiiu: Implement controller changes
* wiiu: Update BUILDING.md
Co-authored-by: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com>
Co-authored-by: David Chavez <david@dcvz.io>
2022-08-14 22:57:24 -04:00
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
