mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-25 01:28:54 -05:00
Code Issues Projects Releases Wiki Activity

Force setting on in rando

Browse Source
This commit is contained in:
JordanLongstaff 2024-12-06 11:22:28 -05:00
parent 8d6afb0b6a
commit 3964051420
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
soh/soh/Enhancements/mods.cpp
View File

@ -783,17 +783,12 @@ void RegisterBrokenGiantsKnifeFix() {
int32_t bypassEquipmentChecks = 0;
if (CVarGetInteger(CVAR_ENHANCEMENT("FixBrokenGiantsKnife"), 0)) {
// Flag wasn't reset because Kokiri or Master Sword
// was missing, so we need to bypass those checks
if (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("FixBrokenGiantsKnife"), 0)) {
// Flag wasn't reset because Kokiri or Master Sword was missing, so we need to
// bypass those checks
bypassEquipmentChecks |= (1 << EQUIP_INV_SWORD_KOKIRI) | (1 << EQUIP_INV_SWORD_MASTER);
} else if (IS_RANDO) {
// In rando, when buying Giant's Knife, bypass check
// for the Kokiri Sword in case we don't have it
bypassEquipmentChecks |= (1 << EQUIP_INV_SWORD_KOKIRI);
} else {
// If neither of the above cases was true, flag should
// be handled exclusively by vanilla behaviour
// If enhancement is off, flag should be handled exclusively by vanilla behaviour
return;
}

6
soh/soh/SohMenuBar.cpp
View File

@ -1525,7 +1525,11 @@ void DrawEnhancementsMenu() {
UpdatePatchHand();
}
UIWidgets::Tooltip("Fixes Adult Link having a backwards left hand when holding the Megaton Hammer.");
UIWidgets::PaddedEnhancementCheckbox("Fix Broken Giant's Knife bug", CVAR_ENHANCEMENT("FixBrokenGiantsKnife"), true, false);
UIWidgets::PaddedEnhancementCheckbox(
"Fix Broken Giant's Knife bug", CVAR_ENHANCEMENT("FixBrokenGiantsKnife"), true, false, IS_RANDO,
"This setting is forcefully enabled when you are playing a randomizer.",
UIWidgets::CheckboxGraphics::Checkmark
);
UIWidgets::Tooltip("Fixes the Broken Giant's Knife flag not being reset when Medigoron fixes it");
ImGui::EndMenu();