From df506535919cf7a97879caf92ae7037fa326dc4a Mon Sep 17 00:00:00 2001 From: EchoesFromBeyond Date: Wed, 20 Jul 2022 12:26:46 -0700 Subject: [PATCH] Custom HotKeys for NoClip Add Custom HotKeys for NoClip for WASD and AltSpeed Key as well as Ascend and Descend Keys. --- .../src/user/cheat/player/NoClip.cpp | 43 ++++++++++++++++--- cheat-library/src/user/cheat/player/NoClip.h | 11 +++++ 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/cheat-library/src/user/cheat/player/NoClip.cpp b/cheat-library/src/user/cheat/player/NoClip.cpp index c32fa4c..5143bea 100644 --- a/cheat-library/src/user/cheat/player/NoClip.cpp +++ b/cheat-library/src/user/cheat/player/NoClip.cpp @@ -13,6 +13,7 @@ namespace cheat::feature app::Vector3 zero; NoClip::NoClip() : Feature(), +<<<<<<< Updated upstream NF(f_Enabled, "No clip", "NoClip", false), NF(f_NoAnimation, "No Animation", "NoClip", true), NF(f_Speed, "Speed", "NoClip", 5.5f), @@ -21,6 +22,23 @@ namespace cheat::feature NF(f_FreeflightMode, "Freeflight mode", "NoClip", false), NF(f_AltSpeedEnabled, "Alt speed enabled", "NoClip", false), NF(f_AltSpeed, "Alt speed", "NoClip", 1.0f) +======= + NF(f_Enabled, "No clip", "NoClip", false), + NF(f_NoAnimation, "No Animation", "NoClip", true), + NF(f_ForwardKey, "Forward HotKey", "NoClip", Hotkey(ImGuiKey_W)), + NF(f_LeftKey, "Left HotKey", "NoClip", Hotkey(ImGuiKey_A)), + NF(f_BackKey, "Back HotKey", "NoClip", Hotkey(ImGuiKey_S)), + NF(f_RightKey, "Right HotKey", "NoClip", Hotkey(ImGuiKey_D)), + NF(f_AscendKey, "Ascend HotKey", "NoClip", Hotkey(ImGuiKey_Space)), + NF(f_DescendKey, "Descend HotKey", "NoClip", Hotkey(ImGuiKey_ModShift)), + NF(f_Speed, "Speed", "NoClip", 5.5f), + NF(f_CameraRelative, "Relative to camera", "NoClip", true), + NF(f_VelocityMode, "Velocity mode", "NoClip", false), + NF(f_FreeflightMode, "Freeflight mode", "NoClip", false), + NF(f_AltSpeedEnabled, "Alt speed enabled", "NoClip", false), + NF(f_AltSpeed, "Alt speed", "NoClip", 1.0f), + NF(f_AltSpeedKey, "Alt Speed Hotkey", "NoClip", Hotkey(ImGuiKey_ModCtrl)) +>>>>>>> Stashed changes { HookManager::install(app::MoleMole_HumanoidMoveFSM_LateTick, HumanoidMoveFSM_LateTick_Hook); @@ -41,6 +59,16 @@ namespace cheat::feature ConfigWidget("No Animation", f_NoAnimation, "Disables player animations."); +<<<<<<< Updated upstream +======= + ConfigWidget("Forward HotKey", f_ForwardKey, "Set Forward Key"); + ConfigWidget("Left HotKey", f_LeftKey, "Set Left Key"); + ConfigWidget("Back HotKey", f_BackKey, "Set Back Key"); + ConfigWidget("Right HotKey", f_RightKey, "Set Right Key"); + ConfigWidget("Ascend HotKey", f_AscendKey, "Set Ascend Key"); + ConfigWidget("Descend HotKey", f_DescendKey, "Set Descend Key"); + +>>>>>>> Stashed changes ConfigWidget("Speed", f_Speed, 0.1f, 2.0f, 100.0f, "No-clip move speed.\n" \ "Not recommended setting above 5.0."); @@ -56,7 +84,8 @@ namespace cheat::feature ConfigWidget("Alt Speed", f_AltSpeed, 0.1f, 2.0f, 100.0f, "Alternate no-clip move speed.\n" \ "Not recommended setting above 5.0."); - + + ConfigWidget("Alt Speed Key", f_AltSpeedKey, "Set AltSpeed HotKey"); ConfigWidget("Velocity mode", f_VelocityMode,"Use velocity instead of position to move."); ConfigWidget("Freeflight mode", f_FreeflightMode,"Don't remove collisions"); } @@ -128,23 +157,23 @@ namespace cheat::feature auto relativeEntity = f_CameraRelative ? &cameraEntity : avatarEntity; float speed = f_Speed.value(); - if (f_AltSpeedEnabled && Hotkey(VK_LCONTROL).IsPressed()) + if (f_AltSpeedEnabled && f_AltSpeedKey.value().IsPressed()) speed = f_AltSpeed.value(); app::Vector3 dir = {}; - if (Hotkey('W').IsPressed()) + if (f_ForwardKey.value().IsPressed()) dir = dir + relativeEntity->forward(); - if (Hotkey('S').IsPressed()) + if (f_BackKey.value().IsPressed()) dir = dir + relativeEntity->back(); - if (Hotkey('D').IsPressed()) + if (f_RightKey.value().IsPressed()) dir = dir + relativeEntity->right(); - if (Hotkey('A').IsPressed()) + if (f_LeftKey.value().IsPressed()) dir = dir + relativeEntity->left(); - if (Hotkey(VK_SPACE).IsPressed()) + if (f_AscendKey.value().IsPressed()) dir = dir + avatarEntity->up(); if (Hotkey(ImGuiKey_ModShift).IsPressed()) diff --git a/cheat-library/src/user/cheat/player/NoClip.h b/cheat-library/src/user/cheat/player/NoClip.h index ecfc01d..613fad1 100644 --- a/cheat-library/src/user/cheat/player/NoClip.h +++ b/cheat-library/src/user/cheat/player/NoClip.h @@ -12,6 +12,16 @@ namespace cheat::feature public: config::Field> f_Enabled; config::Field> f_NoAnimation; +<<<<<<< Updated upstream +======= + + config::Field f_ForwardKey; + config::Field f_LeftKey; + config::Field f_RightKey; + config::Field f_BackKey; + config::Field f_AscendKey; + config::Field f_DescendKey; +>>>>>>> Stashed changes config::Field f_Speed; config::Field f_CameraRelative; @@ -20,6 +30,7 @@ namespace cheat::feature config::Field f_AltSpeedEnabled; config::Field f_AltSpeed; + config::Field f_AltSpeedKey; static NoClip& GetInstance();