Merge pull request #3302 from inspectredc/toggle-strength

Toggle Strength Option
2023-11-24 12:26:34 -06:00
parent bdc6fad0a9 2cbbaba9cc
commit 1e4784af8f
3 changed files with 110 additions and 5 deletions
--- a/soh/src/code/z_player_lib.c
+++ b/soh/src/code/z_player_lib.c
@@ -743,6 +743,10 @@ s32 Player_IsBurningStickInRange(PlayState* play, Vec3f* pos, f32 xzRange, f32 y
 s32 Player_GetStrength(void) {
    s32 strengthUpgrade = CUR_UPG_VALUE(UPG_STRENGTH);

+    if (CVarGetInteger("gToggleStrength", 0) && CVarGetInteger("gStrengthDisabled", 0)) {
+        return PLAYER_STR_NONE;
+    }
+
    if (CVarGetInteger("gTimelessEquipment", 0) || LINK_IS_ADULT) {
        return strengthUpgrade;
    } else if (strengthUpgrade != 0) {