briaguya
0017168aa4
Merge pull request #1153 from briaguya-ai/mask-select-check-for-open-shop
...
add check for mask shop being open to mask select
2022-08-11 02:30:44 -04: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
Kenix3
d34a6d7666
Fixes error in LUS where there were multiple Vertex classes declared.
2022-08-10 23:14:29 -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
Kenix3
3bcc9514ab
Cleanup ControlDeck class
2022-08-10 20:21:36 -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
briaguya
b420ad88c4
Merge pull request #1136 from briaguya-ai/make-array-big-enough-for-all-the-checks
...
make array big enough for all the checks
2022-08-10 12:07:58 -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
35f69f6fd6
Merge pull request #1132 from briaguya-ai/complete-mask-quest
...
complete mask quest
2022-08-10 06:41:11 -04:00
briaguya
d523ba5127
complete mask quest
2022-08-10 06:28:10 -04:00
briaguya
2dbdbea3d2
Merge pull request #1130 from briaguya-ai/initialize-tracker-item-size
...
initialize icon size on item tracker
2022-08-10 04:43:20 -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
15fba97949
Fixes some missed conversions of Console class singleton within the class itself.
2022-08-10 00:38:56 -04:00
Kenix3
6766719969
Fixes issue in Apple builds where imgui was referring directly to Console.Commands
2022-08-10 00:38:56 -04:00
Kenix3
6484d9354d
Fixes incorrect command string when adding basic console commands.
2022-08-10 00:38:56 -04:00
Kenix3
23fb885e09
Console class is now a proper object oriented class.
2022-08-10 00:38:56 -04:00
Kenix3
81cd594704
Console now exposes commands with a reference to itself.
2022-08-10 00:38:56 -04:00
Kenix3
797d9fab7c
GameOverlay command handler no longer uses SPDLOG and prints to console.
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