Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Enhancement] EasyMaskEquip #755

Open
wants to merge 64 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
1279932
Initial implementation
mckinlee Aug 11, 2024
9865817
Merge branch 'develop' into easymaskequip
mckinlee Aug 11, 2024
544d73d
fixed bug where mask was reequipping on next pause menu close
mckinlee Aug 11, 2024
37dc192
added checks to restrict masks from being equipped in some situations…
mckinlee Aug 11, 2024
4f08dac
adds check to prevent equip in air and adds selection audio
mckinlee Aug 11, 2024
d43dace
added checks to prevent equipping transformation masks when the playe…
mckinlee Aug 12, 2024
a26f082
bug fix for border appearing on empty mask slot and removed some resi…
mckinlee Aug 12, 2024
8619be5
bug fix for border not appearing and added check to prevent equipping…
mckinlee Aug 13, 2024
5cd8fad
forgot to run clang format script
mckinlee Aug 13, 2024
d11de26
Refactor EasyMaskEquip related logic
mckinlee Sep 13, 2024
0616660
Merge remote-tracking branch 'upstream/develop' into easymaskequip
mckinlee Sep 13, 2024
8d557a5
Merge branch 'HarbourMasters:develop' into easymaskequip
mckinlee Sep 13, 2024
f185eb0
add missing before/after for the other draw, thanks Proxy!
mckinlee Sep 13, 2024
3de4d00
Merge branch 'easymaskequip' of https://github.com/mckinlee/2ship2har…
mckinlee Sep 13, 2024
f613288
Merge branch 'HarbourMasters:develop' into easymaskequip
mckinlee Sep 13, 2024
69cb797
remove redefinition and fix grayscale issue, again thanks Proxy!
mckinlee Sep 13, 2024
2318ece
Merge branch 'easymaskequip' of https://github.com/mckinlee/2ship2har…
mckinlee Sep 13, 2024
7ed6b94
added more checks for when the player is busy and cannot equip a mask
mckinlee Sep 13, 2024
16bdcad
Remove extra function prototype
mckinlee Sep 13, 2024
aa20a86
rework and document all conditions in ShouldEquipMask
mckinlee Sep 14, 2024
252d499
run clang script
mckinlee Sep 14, 2024
8c48655
added support for unrestricted items/fierce deity anywhere and a chec…
mckinlee Sep 15, 2024
ba49399
clang script
mckinlee Sep 15, 2024
62596cb
replace held item with first person check, add giant mask checks
mckinlee Sep 15, 2024
95b5afe
one day i won't forget to run the clang script
mckinlee Sep 15, 2024
755455f
support persistent bunny hood, utilize GI_VB_KALEIDO_DISPLAY_ITEM_TEXT
mckinlee Sep 15, 2024
a00c2f3
switched to gameinteractor hook for mask equip C/D button restriction
mckinlee Sep 15, 2024
ab7a513
fix underwater check, fix climbing check
mckinlee Sep 16, 2024
b6a05cd
Merge branch 'HarbourMasters:develop' into easymaskequip
mckinlee Sep 26, 2024
de164bb
remove null arg
mckinlee Sep 26, 2024
5924826
Initial implementation
mckinlee Aug 11, 2024
14d38e0
fixed bug where mask was reequipping on next pause menu close
mckinlee Aug 11, 2024
c750c6b
added checks to restrict masks from being equipped in some situations…
mckinlee Aug 11, 2024
fafed87
adds check to prevent equip in air and adds selection audio
mckinlee Aug 11, 2024
ae4525f
added checks to prevent equipping transformation masks when the playe…
mckinlee Aug 12, 2024
cc0984f
bug fix for border appearing on empty mask slot and removed some resi…
mckinlee Aug 12, 2024
8ad39bc
bug fix for border not appearing and added check to prevent equipping…
mckinlee Aug 13, 2024
772962d
forgot to run clang format script
mckinlee Aug 13, 2024
ffa72f2
Refactor EasyMaskEquip related logic
mckinlee Sep 13, 2024
27ba509
add missing before/after for the other draw, thanks Proxy!
mckinlee Sep 13, 2024
fb452ca
remove redefinition and fix grayscale issue, again thanks Proxy!
mckinlee Sep 13, 2024
8917475
added more checks for when the player is busy and cannot equip a mask
mckinlee Sep 13, 2024
9e4801a
rework and document all conditions in ShouldEquipMask
mckinlee Sep 14, 2024
e293409
run clang script
mckinlee Sep 14, 2024
bf13f5a
added support for unrestricted items/fierce deity anywhere and a chec…
mckinlee Sep 15, 2024
3d9ea77
clang script
mckinlee Sep 15, 2024
0b3cc72
replace held item with first person check, add giant mask checks
mckinlee Sep 15, 2024
8bc183f
one day i won't forget to run the clang script
mckinlee Sep 15, 2024
f8fd7b0
support persistent bunny hood, utilize GI_VB_KALEIDO_DISPLAY_ITEM_TEXT
mckinlee Sep 15, 2024
1054cdd
switched to gameinteractor hook for mask equip C/D button restriction
mckinlee Sep 15, 2024
e64c7ae
fix underwater check, fix climbing check
mckinlee Sep 16, 2024
2f7d422
remove null arg
mckinlee Sep 26, 2024
722455c
some changes
mckinlee Oct 6, 2024
39c5b65
Merge branch 'easymaskequip' of https://github.com/mckinlee/2ship2har…
mckinlee Oct 6, 2024
00a19ae
some more changes
mckinlee Oct 6, 2024
97e2876
bump lus
mckinlee Oct 6, 2024
3533554
add checkbox to modern menu
mckinlee Oct 6, 2024
9e40615
Merge branch 'develop' into easymaskequip
mckinlee Oct 8, 2024
19c037d
Merge branch 'develop' into easymaskequip
mckinlee Oct 9, 2024
1bebd80
simplify some things
mckinlee Oct 10, 2024
7329834
Merge branch 'develop' into easymaskequip
mckinlee Oct 10, 2024
e778755
remove duplicate header from merge
mckinlee Oct 10, 2024
5a35bac
bunch of fixes
mckinlee Oct 17, 2024
73d5841
Merge branch 'develop' into easymaskequip
mckinlee Oct 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions mm/2s2h/BenGui/BenMenuBar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,9 @@ void DrawEnhancementsMenu() {
"'A' on it in the mask menu." })) {
UpdatePersistentMasksState();
}
UIWidgets::CVarCheckbox(
"Easy Mask Equip", "gEnhancements.Masks.EasyMaskEquip",
{ .tooltip = "Allows you to equip masks directly from the pause menu by pressing A." });

ImGui::EndMenu();
}
Expand Down
4 changes: 3 additions & 1 deletion mm/2s2h/BenGui/SearchableMenuItems.h
Original file line number Diff line number Diff line change
Expand Up @@ -1231,7 +1231,9 @@ void AddEnhancements() {
{},
[](widgetInfo& info) { UpdatePersistentMasksState(); } },
{ "No Blast Mask Cooldown", "gEnhancements.Masks.NoBlastMaskCooldown",
"Eliminates the Cooldown between Blast Mask usage.", WIDGET_CVAR_CHECKBOX } },
"Eliminates the Cooldown between Blast Mask usage.", WIDGET_CVAR_CHECKBOX },
{ "Easy Mask Equip", "gEnhancements.Masks.EasyMaskEquip",
"Allows you to equip masks directly from the pause menu by pressing A.", WIDGET_CVAR_CHECKBOX } },
// Song Enhancements
{ { .widgetName = "Ocarina", .widgetType = WIDGET_SEPARATOR_TEXT },
{ "Enable Sun's Song", "gEnhancements.Songs.EnableSunsSong",
Expand Down
1 change: 1 addition & 0 deletions mm/2s2h/Enhancements/Enhancements.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ void InitEnhancements() {
RegisterBlastMaskKeg();
RegisterNoBlastMaskCooldown();
RegisterPersistentMasks();
RegisterEasyMaskEquip();

// Minigames
RegisterAlwaysWinDoggyRace();
Expand Down
Loading
Loading