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] Disable Takkuri Steal #776

Merged
merged 16 commits into from
Oct 7, 2024
3 changes: 3 additions & 0 deletions mm/2s2h/BenGui/BenMenuBar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,9 @@ void DrawEnhancementsMenu() {
"Do not reset Time Speed", "gEnhancements.Cycle.DoNotResetTimeSpeed",
{ .tooltip =
"Playing the Song Of Time will not reset the current time speed set by Inverted Song of Time." });
UIWidgets::CVarCheckbox("Disable Takkuri Steal", "gEnhancements.Cheats.DisableTakkuriSteal",
{ .tooltip = "Prevents the Takkuri from stealing key items like bottles and "
"swords. It may still steal other items." });

ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(255, 255, 0, 255));
ImGui::SeparatorText("Unstable");
Expand Down
3 changes: 3 additions & 0 deletions mm/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,9 @@ void func_80C10984(EnThiefbird* this, s32 arg1) {
}

s32 func_80C10B0C(EnThiefbird* this, PlayState* play) {
if (CVarGetInteger("gEnhancements.Cheats.DisableTakkuriSteal", 0)) {
return false;
}
static Gfx* D_80C13680[] = {
gTakkuriStolenKokiriSwordDL,
gTakkuriStolenRazorSwordDL,
Expand Down