From f85b04336c048ce0076484e0ce32bd26badf9cb2 Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Thu, 15 Jun 2023 03:25:48 +0000 Subject: [PATCH] Add option to prevent speed modifier from affecting jump velocity (#2874) --- soh/soh/Enhancements/controls/GameControlEditor.cpp | 1 + soh/src/overlays/actors/ovl_player_actor/z_player.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/controls/GameControlEditor.cpp b/soh/soh/Enhancements/controls/GameControlEditor.cpp index 6dd21517a..3b2415de6 100644 --- a/soh/soh/Enhancements/controls/GameControlEditor.cpp +++ b/soh/soh/Enhancements/controls/GameControlEditor.cpp @@ -314,6 +314,7 @@ namespace GameControlEditor { UIWidgets::Spacer(5); window->BeginGroupPanelPublic("Walk Modifier", ImGui::GetContentRegionAvail()); UIWidgets::PaddedEnhancementCheckbox("Toggle modifier instead of holding", "gWalkSpeedToggle", true, false); + UIWidgets::PaddedEnhancementCheckbox("Don't affect jump distance/velocity", "gWalkModifierDoesntChangeJump", true, false); UIWidgets::PaddedEnhancementSliderFloat("Modifier 1: %d %%", "##WalkMod1", "gWalkModifierOne", 0.0f, 5.0f, "", 1.0f, true, true, false, true); UIWidgets::PaddedEnhancementSliderFloat("Modifier 2: %d %%", "##WalkMod2", "gWalkModifierTwo", 0.0f, 5.0f, "", 1.0f, true, true, false, true); window->EndGroupPanelPublic(0); diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index f8b3f44d3..0ede05482 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -6124,7 +6124,7 @@ void func_8083DFE0(Player* this, f32* arg1, s16* arg2) { maxSpeed *= 1.5f; } - if (CVarGetInteger("gEnableWalkModify", 0)) { + if (CVarGetInteger("gEnableWalkModify", 0) && !CVarGetInteger("gWalkModifierDoesntChangeJump", 0)) { if (CVarGetInteger("gWalkSpeedToggle", 0)) { if (gWalkSpeedToggle1) { maxSpeed *= CVarGetFloat("gWalkModifierOne", 1.0f);