From 0b733e49e59ccd14a0158aa5c01156d25bc5399c Mon Sep 17 00:00:00 2001 From: Fr0go1 <112802612+Fr0go1@users.noreply.github.com> Date: Fri, 20 Oct 2023 06:24:16 +1000 Subject: [PATCH] Changed ui and added more visible esp support --- CS2_External/Cheats.cpp | 454 +++++++++++++----------- CS2_External/MenuConfig.hpp | 6 +- CS2_External/OS-ImGui/OS-ImGui_Base.cpp | 2 +- CS2_External/Utils/ConfigSaver.cpp | 9 +- CS2_External/Utils/style.hpp | 8 +- 5 files changed, 258 insertions(+), 221 deletions(-) diff --git a/CS2_External/Cheats.cpp b/CS2_External/Cheats.cpp index 68fc1d0..d51ac91 100644 --- a/CS2_External/Cheats.cpp +++ b/CS2_External/Cheats.cpp @@ -34,231 +34,249 @@ static void HotKey(int* k, const ImVec2& size_arg = ImVec2(0, 0)) void Cheats::Menu() { - static int selectedStyleIndex = 0; static int tabb = 0; - static int styleee = 1; + //ImGui::ShowMetricsWindow(); - ImGui::Begin("Aeonix",nullptr,ImGuiWindowFlags_AlwaysAutoResize); - { - //ImGui::SetNextWindowSize(ImVec2(900, 900)); - //ImGui::ShowMetricsWindow(); + ImGui::SetNextWindowSize(ImVec2(625, 645)); - if (styleee == 3) { - SetupImGuiStyle1(); - } - else if (styleee == 2) { - SetupImGuiStyle2(); - } - else if (styleee == 1) { - SetupImGuiStyle3(); - } - - if (ImGui::Button(ICON_FA_EYE" Visuals")) { - tabb = 0; - } - ImGui::SameLine(0, 1); - - if (ImGui::Button(ICON_FA_USER_CIRCLE" Aimbot")) { - tabb = 1; - } - ImGui::SameLine(0, 1); - - if (ImGui::Button(ICON_FA_FILE_CODE" Misc")) { - tabb = 2; - } - ImGui::SameLine(0, 1); + ImGui::Begin("Aeonix",nullptr, ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize); + { + if (ImGui::BeginChild(1, ImVec2(115, 600), true)) { - if (ImGui::Button(ICON_FA_HAND_POINTER" Triggerbot")) { - tabb = 3; - } - ImGui::SameLine(0, 1); + if (MenuConfig::styleee == 3) { + SetupImGuiStyle1(); + } + else if (MenuConfig::styleee == 2) { + SetupImGuiStyle2(); + } + else if (MenuConfig::styleee == 1) { + SetupImGuiStyle3(); + } - if (ImGui::Button(ICON_FA_FOLDER_OPEN" Config")) { - tabb = 4; + if (ImGui::Button(ICON_FA_EYE" Visuals", ImVec2(100, 30))) { + tabb = 0; + } + ImGui::Spacing(); + if (ImGui::Button(ICON_FA_USER_CIRCLE" Aimbot", ImVec2(100, 30))) { + tabb = 1; + } + ImGui::Spacing(); + if (ImGui::Button(ICON_FA_FILE_CODE" Misc", ImVec2(100, 30))) { + tabb = 2; + } + ImGui::Spacing(); + if (ImGui::Button(ICON_FA_HAND_POINTER" Triggerbot", ImVec2(100, 30))) { + tabb = 3; + } + ImGui::Spacing(); + if (ImGui::Button(ICON_FA_FOLDER_OPEN" Config", ImVec2(100, 30))) { + tabb = 4; + } + ImGui::Spacing(); + if (ImGui::Button(ICON_FA_SUN" Settings", ImVec2(100, 30))) { + tabb = 5; + } } + ImGui::EndChild(); - ImGui::Separator(); - - if (tabb == 0) { - //esp - ImGui::Text("-Visuals-"); - - ImGui::Checkbox("BoxESP", &MenuConfig::ShowBoxESP); - ImGui::SameLine(); - ImGui::ColorEdit4("##BoxColor", reinterpret_cast(&MenuConfig::BoxColor), ImGuiColorEditFlags_NoInputs); - - ImGui::Combo("BoxType", &MenuConfig::BoxType, "Normal\0Dynamic"); + ImGui::SameLine(); - ImGui::Checkbox("VisibleBoneESP", &MenuConfig::VisibleEsp); - ImGui::SameLine(); - ImGui::ColorEdit4("##BoneVisColor", reinterpret_cast(&MenuConfig::BoneVisColor), ImGuiColorEditFlags_NoInputs); + if (ImGui::BeginChild(2, ImVec2(485, 600), true)) { - ImGui::Checkbox("BoneESP", &MenuConfig::ShowBoneESP); - ImGui::SameLine(); - ImGui::ColorEdit4("##BoneColor", reinterpret_cast(&MenuConfig::BoneColor), ImGuiColorEditFlags_NoInputs); + if (tabb == 0) { + //esp + ImGui::Text("-Visuals-"); - ImGui::Text("BoneEspColor (for debugging)"); - ImGui::SameLine(); - ImGui::ColorEdit4("##BoneColorESP", reinterpret_cast(&MenuConfig::BoneColorESP), ImGuiColorEditFlags_NoInputs); + ImGui::Checkbox("BoxESP", &MenuConfig::ShowBoxESP); + ImGui::SameLine(); + ImGui::ColorEdit4("##BoxColor", reinterpret_cast(&MenuConfig::BoxColor), ImGuiColorEditFlags_NoInputs); + ImGui::SameLine(); + if (ImGui::Button("VisCheck")) + ImGui::OpenPopup("##boxvis"); + if (ImGui::BeginPopup("##boxvis")) + { + ImGui::TextUnformatted("Settings"); + ImGui::Checkbox("VisibleBoxESP", &MenuConfig::EspVisCheck); + ImGui::SameLine(); + ImGui::ColorEdit4("##BoxVisColor", reinterpret_cast(&MenuConfig::VisibleColor), ImGuiColorEditFlags_NoInputs); + ImGui::EndPopup(); + } + ImGui::Combo("BoxType", &MenuConfig::BoxType, "Normal\0Dynamic"); - ImGui::Checkbox("EyeRay", &MenuConfig::ShowEyeRay); - ImGui::SameLine(); - ImGui::ColorEdit4("##EyeRay", reinterpret_cast(&MenuConfig::EyeRayColor), ImGuiColorEditFlags_NoInputs); + ImGui::Checkbox("BoneESP", &MenuConfig::ShowBoneESP); + ImGui::SameLine(); + ImGui::ColorEdit4("##BoneColor", reinterpret_cast(&MenuConfig::BoneColor), ImGuiColorEditFlags_NoInputs); + ImGui::SameLine(); + if (ImGui::Button("VisCheck")) + ImGui::OpenPopup("##bonevis"); + if (ImGui::BeginPopup("##bonevis")) + { + ImGui::TextUnformatted("Settings"); + ImGui::Checkbox("VisibleBoneESP", &MenuConfig::VisibleEsp); + ImGui::SameLine(); + ImGui::ColorEdit4("##BoneVisColor", reinterpret_cast(&MenuConfig::BoneVisColor), ImGuiColorEditFlags_NoInputs); + ImGui::EndPopup(); + } - ImGui::Checkbox("HealthBar", &MenuConfig::ShowHealthBar); - ImGui::Combo("HealthBarType", &MenuConfig::HealthBarType, "Vetical\0Horizontal"); + ImGui::Checkbox("EyeRay", &MenuConfig::ShowEyeRay); + ImGui::SameLine(); + ImGui::ColorEdit4("##EyeRay", reinterpret_cast(&MenuConfig::EyeRayColor), ImGuiColorEditFlags_NoInputs); + + ImGui::Checkbox("HealthBar", &MenuConfig::ShowHealthBar); + ImGui::Combo("HealthBarType", &MenuConfig::HealthBarType, "Vetical\0Horizontal"); + + ImGui::Checkbox("WeaponText", &MenuConfig::ShowWeaponESP); + ImGui::Checkbox("PlayerName", &MenuConfig::ShowPlayerName); + + ImGui::Checkbox("HeadShootLine", &MenuConfig::ShowHeadShootLine); + ImGui::SameLine(); + ImGui::ColorEdit4("##HeadShootLineColor", reinterpret_cast(&MenuConfig::HeadShootLineColor), ImGuiColorEditFlags_NoInputs); + + ImGui::Checkbox("FovLine", &MenuConfig::ShowFovLine); + ImGui::SameLine(); + ImGui::ColorEdit4("##FovLineColor", reinterpret_cast(&MenuConfig::FovLineColor), ImGuiColorEditFlags_NoInputs); + float FovLineSizeMin = 20.f, FovLineSizeMax = 120.f; + Gui.SliderScalarEx1("FovLineSize", ImGuiDataType_Float, &MenuConfig::FovLineSize, &FovLineSizeMin, &FovLineSizeMax, "%.1f", ImGuiSliderFlags_None); + + ImGui::Checkbox("LineToEnemy", &MenuConfig::ShowLineToEnemy); + ImGui::SameLine(); + ImGui::ColorEdit4("##LineToEnemyColor", reinterpret_cast(&MenuConfig::LineToEnemyColor), ImGuiColorEditFlags_NoInputs); + + ImGui::Checkbox("CrossHair", &MenuConfig::ShowCrossHair); + ImGui::SameLine(); + ImGui::ColorEdit4("##CrossHairColor", reinterpret_cast(&CrosshairConfig::CrossHairColor), ImGuiColorEditFlags_NoInputs); + ImGui::SameLine(); + if (ImGui::Button("Settings")) + ImGui::OpenPopup("##Settings"); + if (ImGui::BeginPopup("##Settings")) + { + ImGui::TextUnformatted("Settings"); + ImGui::Checkbox("Center Dot", &CrosshairConfig::drawDot); + ImGui::SliderInt("Horizontal Length", &CrosshairConfig::HorizontalLength, 0, 75, "%d"); + ImGui::SliderInt("Vertical Length", &CrosshairConfig::VerticalLength, 0, 75, "%d"); + ImGui::SliderInt("Gap", &CrosshairConfig::Gap, 0, 35, "%d"); + ImGui::Checkbox("Outline", &CrosshairConfig::drawOutLine); + ImGui::Checkbox("T Style", &CrosshairConfig::tStyle); + ImGui::EndPopup(); + } - ImGui::Checkbox("WeaponText", &MenuConfig::ShowWeaponESP); - ImGui::Checkbox("PlayerName", &MenuConfig::ShowPlayerName); + ImGui::Checkbox("Distance Esp", &MenuConfig::ShowDistance); - ImGui::Checkbox("HeadShootLine", &MenuConfig::ShowHeadShootLine); - ImGui::SameLine(); - ImGui::ColorEdit4("##HeadShootLineColor", reinterpret_cast(&MenuConfig::HeadShootLineColor), ImGuiColorEditFlags_NoInputs); + } + else if (tabb == 1) { + //aimbot + ImGui::Text("-Aimbot-"); - ImGui::Checkbox("FovLine", &MenuConfig::ShowFovLine); - ImGui::SameLine(); - ImGui::ColorEdit4("##FovLineColor", reinterpret_cast(&MenuConfig::FovLineColor), ImGuiColorEditFlags_NoInputs); - float FovLineSizeMin = 20.f, FovLineSizeMax = 120.f; - Gui.SliderScalarEx1("FovLineSize", ImGuiDataType_Float, &MenuConfig::FovLineSize, &FovLineSizeMin, &FovLineSizeMax, "%.1f", ImGuiSliderFlags_None); + ImGui::Checkbox("AimBot", &MenuConfig::AimBot); + ImGui::SameLine(); + HotKey(&AimControl::HotKey, ImVec2(95, 28)); - ImGui::Checkbox("LineToEnemy", &MenuConfig::ShowLineToEnemy); - ImGui::SameLine(); - ImGui::ColorEdit4("##LineToEnemyColor", reinterpret_cast(&MenuConfig::LineToEnemyColor), ImGuiColorEditFlags_NoInputs); + if (ImGui::Combo("AimKey", &MenuConfig::AimBotHotKey, "MENU\0RBUTTON\0XBUTTON1\0XBUTTON2\0CAPITAL\0SHIFT\0CONTROL")) + { + AimControl::SetHotKey(MenuConfig::AimBotHotKey); + } - ImGui::Checkbox("CrossHair", &MenuConfig::ShowCrossHair); - ImGui::SameLine(); - ImGui::ColorEdit4("##CrossHairColor", reinterpret_cast(&CrosshairConfig::CrossHairColor), ImGuiColorEditFlags_NoInputs); - ImGui::SameLine(); - if (ImGui::Button("Settings")) - ImGui::OpenPopup("##Settings"); - if (ImGui::BeginPopup("##Settings")) - { - ImGui::TextUnformatted("Settings"); - ImGui::Checkbox("Center Dot", &CrosshairConfig::drawDot); - ImGui::SliderInt("Horizontal Length", &CrosshairConfig::HorizontalLength, 0, 75, "%d"); - ImGui::SliderInt("Vertical Length", &CrosshairConfig::VerticalLength, 0, 75, "%d"); - ImGui::SliderInt("Gap", &CrosshairConfig::Gap, 0, 35, "%d"); - ImGui::Checkbox("Outline", &CrosshairConfig::drawOutLine); - ImGui::Checkbox("T Style", &CrosshairConfig::tStyle); - ImGui::EndPopup(); + float FovMin = 0.1f, FovMax = 89.f; + float SmoothMin = 0.1f, SmoothMax = 1.f; + Gui.SliderScalarEx1("AimFov", ImGuiDataType_Float, &AimControl::AimFov, &FovMin, &FovMax, "%.1f", ImGuiSliderFlags_None); + ImGui::Checkbox("FovCircle", &MenuConfig::ShowAimFovRange); + ImGui::SameLine(); + ImGui::ColorEdit4("##FovCircleColor", reinterpret_cast(&MenuConfig::AimFovRangeColor), ImGuiColorEditFlags_NoInputs); + Gui.SliderScalarEx1("Smooth", ImGuiDataType_Float, &AimControl::Smooth, &SmoothMin, &SmoothMax, "%.1f", ImGuiSliderFlags_None); + if (ImGui::Combo("AimPos", &MenuConfig::AimPosition, "Head\0Neck\0Spine")) + { + switch (MenuConfig::AimPosition) + { + case 0: + MenuConfig::AimPositionIndex = BONEINDEX::head; + break; + case 1: + MenuConfig::AimPositionIndex = BONEINDEX::neck_0; + break; + case 2: + MenuConfig::AimPositionIndex = BONEINDEX::spine_1; + break; + default: + break; + } + } + float BulletMin = 1, BulletMax = 6; + float RecoilMin = 0.f, RecoilMax = 2.f; + Gui.SliderScalarEx1("Start Bullet", ImGuiDataType_U32, &AimControl::RCSBullet, &BulletMin, &BulletMax, "%1.f", ImGuiSliderFlags_None); + Gui.SliderScalarEx1("RCS Yaw", ImGuiDataType_Float, &AimControl::RCSScale.x, &RecoilMin, &RecoilMax, "%.1f", ImGuiSliderFlags_None); + Gui.SliderScalarEx1("RCS Pitch", ImGuiDataType_Float, &AimControl::RCSScale.y, &RecoilMin, &RecoilMax, "%.1f", ImGuiSliderFlags_None); + ImGui::Checkbox("VisibleCheck", &MenuConfig::VisibleCheck); } + else if (tabb == 2) { + //radar + ImGui::Text("-Misc-"); + ImGui::Checkbox("Radar", &MenuConfig::ShowRadar); + ImGui::Combo("RadarType", &MenuConfig::RadarType, "Circle\0Arrow\0CircleWithArrow"); + + ImGui::Checkbox("CrossLine", &MenuConfig::ShowRadarCrossLine); + ImGui::SameLine(); + ImGui::ColorEdit4("##CrossLineColor", reinterpret_cast(&MenuConfig::RadarCrossLineColor), ImGuiColorEditFlags_NoInputs); + + float ProportionMin = 500.f, ProportionMax = 3300.f; + float RadarRangeMin = 100.f, RadarRangeMax = 300.f; + float RadarBgAlphaMin = 0.0f, RadarBgAlphaMax = 1.0f; + float RadarPointSizeProportionMin = 0.8f, RadarPointSizeProportionMax = 2.f; + Gui.SliderScalarEx1("PointSize", ImGuiDataType_Float, &MenuConfig::RadarPointSizeProportion, &RadarPointSizeProportionMin, &RadarPointSizeProportionMax, "%.1f", ImGuiSliderFlags_None); + Gui.SliderScalarEx1("Proportion", ImGuiDataType_Float, &MenuConfig::Proportion, &ProportionMin, &ProportionMax, "%.1f", ImGuiSliderFlags_None); + Gui.SliderScalarEx1("RadarRange", ImGuiDataType_Float, &MenuConfig::RadarRange, &RadarRangeMin, &RadarRangeMax, "%.1f", ImGuiSliderFlags_None); + Gui.SliderScalarEx1("RadarBgAlpha", ImGuiDataType_Float, &MenuConfig::RadarBgAlpha, &RadarBgAlphaMin, &RadarBgAlphaMax, "%.3f", ImGuiSliderFlags_None); + + ImGui::Checkbox("Bunnyhop", &MenuConfig::BunnyHop); + ImGui::SameLine(); + ImGui::Checkbox("Bunnyhop 2", &MenuConfig::BunnyHop2); + } + else if (tabb == 3) { + //triggerbot + ImGui::Text("-Triggerbot-"); - ImGui::Checkbox("Distance Esp", &MenuConfig::ShowDistance); - - } - else if (tabb == 1) { - //aimbot - ImGui::Text("-Aimbot-"); + ImGui::Checkbox("TriggerBot", &MenuConfig::TriggerBot); + ImGui::SameLine(); + HotKey(&TriggerBot::HotKey, ImVec2(95, 28)); - ImGui::Checkbox("AimBot", &MenuConfig::AimBot); - ImGui::SameLine(); - HotKey(&AimControl::HotKey, ImVec2(95, 28)); + if (ImGui::Combo("Triggerbot Key", &MenuConfig::TriggerHotKey, "MENU\0RBUTTON\0XBUTTON1\0XBUTTON2\0CAPITAL\0SHIFT\0CONTROL")) + { + TriggerBot::SetHotKey(MenuConfig::TriggerHotKey); + } - if (ImGui::Combo("AimKey", &MenuConfig::AimBotHotKey, "MENU\0RBUTTON\0XBUTTON1\0XBUTTON2\0CAPITAL\0SHIFT\0CONTROL")) - { - AimControl::SetHotKey(MenuConfig::AimBotHotKey); + DWORD TriggerDelayMin = 15, TriggerDelayMax = 170; + Gui.SliderScalarEx1("Delay", ImGuiDataType_U32, &TriggerBot::TriggerDelay, &TriggerDelayMin, &TriggerDelayMax, "%d", ImGuiSliderFlags_None); } - - float FovMin = 0.1f, FovMax = 89.f; - float SmoothMin = 0.1f, SmoothMax = 1.f; - Gui.SliderScalarEx1("AimFov", ImGuiDataType_Float, &AimControl::AimFov, &FovMin, &FovMax, "%.1f", ImGuiSliderFlags_None); - ImGui::Checkbox("FovCircle", &MenuConfig::ShowAimFovRange); - ImGui::SameLine(); - ImGui::ColorEdit4("##FovCircleColor", reinterpret_cast(&MenuConfig::AimFovRangeColor), ImGuiColorEditFlags_NoInputs); - Gui.SliderScalarEx1("Smooth", ImGuiDataType_Float, &AimControl::Smooth, &SmoothMin, &SmoothMax, "%.1f", ImGuiSliderFlags_None); - if (ImGui::Combo("AimPos", &MenuConfig::AimPosition, "Head\0Neck\0Spine")) - { - switch (MenuConfig::AimPosition) - { + else if (tabb == 4) { + //config + ConfigMenu::RenderConfigMenu(); + } + else if (tabb == 5) { + ImGui::Combo("Select Style", &MenuConfig::selectedStyleIndex, "Purple\0Future Dark\0Peach\0"); + switch (MenuConfig::selectedStyleIndex) { case 0: - MenuConfig::AimPositionIndex = BONEINDEX::head; + MenuConfig::styleee = 1; break; case 1: - MenuConfig::AimPositionIndex = BONEINDEX::neck_0; + MenuConfig::styleee = 2; break; case 2: - MenuConfig::AimPositionIndex = BONEINDEX::spine_1; - break; - default: + MenuConfig::styleee = 3; break; } + ImGui::Checkbox("TeamCheck", &MenuConfig::TeamCheck); + ImGui::SameLine(); + ImGui::Checkbox("BypassOBS", &MenuConfig::OBSBypass); + ImGui::SameLine(); + ImGui::Checkbox("Spectate Esp", &MenuConfig::SpectateEsp); + if (ImGui::Button("Discord")) { + std::system("cmd.exe /c start https://discord.gg/2b66kqG2nK"); + } } - float BulletMin = 1, BulletMax = 6; - float RecoilMin = 0.f, RecoilMax = 2.f; - Gui.SliderScalarEx1("Start Bullet", ImGuiDataType_U32, &AimControl::RCSBullet, &BulletMin, &BulletMax, "%1.f", ImGuiSliderFlags_None); - Gui.SliderScalarEx1("RCS Yaw", ImGuiDataType_Float, &AimControl::RCSScale.x, &RecoilMin, &RecoilMax, "%.1f", ImGuiSliderFlags_None); - Gui.SliderScalarEx1("RCS Pitch", ImGuiDataType_Float, &AimControl::RCSScale.y, &RecoilMin, &RecoilMax, "%.1f", ImGuiSliderFlags_None); - ImGui::Checkbox("VisibleCheck", &MenuConfig::VisibleCheck); - } - else if (tabb == 2) { - //radar - ImGui::Text("-Misc-"); - ImGui::Checkbox("Radar", &MenuConfig::ShowRadar); - ImGui::Combo("RadarType", &MenuConfig::RadarType, "Circle\0Arrow\0CircleWithArrow"); - - ImGui::Checkbox("CrossLine", &MenuConfig::ShowRadarCrossLine); - ImGui::SameLine(); - ImGui::ColorEdit4("##CrossLineColor", reinterpret_cast(&MenuConfig::RadarCrossLineColor), ImGuiColorEditFlags_NoInputs); - - float ProportionMin = 500.f, ProportionMax = 3300.f; - float RadarRangeMin = 100.f, RadarRangeMax = 300.f; - float RadarBgAlphaMin = 0.0f, RadarBgAlphaMax = 1.0f; - float RadarPointSizeProportionMin = 0.8f, RadarPointSizeProportionMax = 2.f; - Gui.SliderScalarEx1("PointSize", ImGuiDataType_Float, &MenuConfig::RadarPointSizeProportion, &RadarPointSizeProportionMin, &RadarPointSizeProportionMax, "%.1f", ImGuiSliderFlags_None); - Gui.SliderScalarEx1("Proportion", ImGuiDataType_Float, &MenuConfig::Proportion, &ProportionMin, &ProportionMax, "%.1f", ImGuiSliderFlags_None); - Gui.SliderScalarEx1("RadarRange", ImGuiDataType_Float, &MenuConfig::RadarRange, &RadarRangeMin, &RadarRangeMax, "%.1f", ImGuiSliderFlags_None); - Gui.SliderScalarEx1("RadarBgAlpha", ImGuiDataType_Float, &MenuConfig::RadarBgAlpha, &RadarBgAlphaMin, &RadarBgAlphaMax, "%.3f", ImGuiSliderFlags_None); - - ImGui::Checkbox("Bunnyhop", &MenuConfig::BunnyHop); - ImGui::SameLine(); - ImGui::Checkbox("Bunnyhop 2", &MenuConfig::BunnyHop2); - } - else if (tabb == 3) { - //triggerbot - ImGui::Text("-Triggerbot-"); - - ImGui::Checkbox("TriggerBot", &MenuConfig::TriggerBot); - ImGui::SameLine(); - HotKey(&TriggerBot::HotKey, ImVec2(95, 28)); - - if (ImGui::Combo("Triggerbot Key", &MenuConfig::TriggerHotKey, "MENU\0RBUTTON\0XBUTTON1\0XBUTTON2\0CAPITAL\0SHIFT\0CONTROL")) - { - TriggerBot::SetHotKey(MenuConfig::TriggerHotKey); - } - - DWORD TriggerDelayMin = 15, TriggerDelayMax = 170; - Gui.SliderScalarEx1("Delay", ImGuiDataType_U32, &TriggerBot::TriggerDelay, &TriggerDelayMin, &TriggerDelayMax, "%d", ImGuiSliderFlags_None); - } - else if (tabb == 4) { - //config - ConfigMenu::RenderConfigMenu(); - } - - ImGui::Separator(); - ImGui::Combo("Select Style", &selectedStyleIndex, "Purple\0Future Dark\0Peach\0"); - switch (selectedStyleIndex) { - case 0: - styleee = 1; - break; - case 1: - styleee = 2; - break; - case 2: - styleee = 3; - break; - } - ImGui::Checkbox("TeamCheck", &MenuConfig::TeamCheck); - ImGui::SameLine(); - ImGui::Checkbox("BypassOBS", &MenuConfig::OBSBypass); - ImGui::SameLine(); - ImGui::Checkbox("Spectate Esp", &MenuConfig::SpectateEsp); - if (ImGui::Button("Discord")) { - std::system("cmd.exe /c start https://discord.gg/2b66kqG2nK"); + ImGui::Text("[INSERT] HideMenu"); } - ImGui::Text("[INSERT] HideMenu"); - + ImGui::EndChild(); } ImGui::End(); } @@ -410,8 +428,22 @@ void Cheats::Run() } // Draw Bone - if (MenuConfig::ShowBoneESP) - Render::DrawBone(Entity, MenuConfig::BoneColorESP, 1.3); + if (MenuConfig::ShowBoneESP) { + Render::DrawBone(Entity, MenuConfig::BoneColor, 1.3); + + //visible bone esp + if (MenuConfig::VisibleEsp) { + if ((Entity.Pawn.bSpottedByMask) > 0) { + Render::DrawBone(Entity, MenuConfig::BoneVisColor, 1.3); + } + else { + Render::DrawBone(Entity, MenuConfig::BoneColor, 1.3); + } + } + else if (!MenuConfig::VisibleCheck) { + Render::DrawBone(Entity, MenuConfig::BoneColor, 1.3); + } + } // Draw eyeRay if (MenuConfig::ShowEyeRay) @@ -436,8 +468,21 @@ void Cheats::Run() Render::LineToEnemy(Rect, MenuConfig::LineToEnemyColor, 1.2); // Draw Box - if (MenuConfig::ShowBoxESP) - Gui.Rectangle({ Rect.x,Rect.y }, { Rect.z,Rect.w }, MenuConfig::BoxColor, 1.3); + if (MenuConfig::ShowBoxESP) { + Gui.Rectangle({ Rect.x, Rect.y }, { Rect.z, Rect.w }, MenuConfig::BoxColor, 3); + //Box Vis Check + if (MenuConfig::EspVisCheck) { + if (Entity.Pawn.bSpottedByMask > 0) { + Gui.Rectangle({ Rect.x, Rect.y }, { Rect.z, Rect.w }, MenuConfig::VisibleColor, 1.3); + } + else { + Gui.Rectangle({ Rect.x, Rect.y }, { Rect.z, Rect.w }, MenuConfig::BoxColor, 1.3); + } + } + else { + Gui.Rectangle({ Rect.x, Rect.y }, { Rect.z, Rect.w }, MenuConfig::BoxColor, 1.3); + } + } // Draw HealthBar if (MenuConfig::ShowHealthBar) @@ -478,19 +523,6 @@ void Cheats::Run() else Gui.StrokeText(Entity.Controller.PlayerName, { Rect.x + Rect.z / 2,Rect.y - 13 - 14 }, ImColor(255, 255, 255, 255), 12, true); } - - //visible esp - if (MenuConfig::VisibleEsp) { - if ((Entity.Pawn.bSpottedByMask) > 0) { - MenuConfig::BoneColorESP = MenuConfig::BoneVisColor; - } - else { - MenuConfig::BoneColorESP = MenuConfig::BoneColor; - } - } - else if (!MenuConfig::VisibleCheck) { - MenuConfig::BoneColorESP = MenuConfig::BoneColor; - } } // Fov line @@ -517,10 +549,6 @@ void Cheats::Run() if (MenuConfig::ShowAimFovRange) Render::DrawFovCircle(LocalEntity); - if (MenuConfig::ShowBoneESP && !MenuConfig::VisibleEsp) { - MenuConfig::BoneColorESP = MenuConfig::BoneColor; - } - if (MenuConfig::BunnyHop) Bunnyhop::Run(LocalEntity); diff --git a/CS2_External/MenuConfig.hpp b/CS2_External/MenuConfig.hpp index 15e80c2..9d1009c 100644 --- a/CS2_External/MenuConfig.hpp +++ b/CS2_External/MenuConfig.hpp @@ -27,7 +27,6 @@ namespace MenuConfig inline int HealthBarType = 0; inline ImColor BoneColor = ImColor(255, 255, 255, 255); - inline ImColor BoneColorESP = ImColor(255, 255, 255, 255); inline ImColor BoneVisColor = ImColor(0, 0, 255, 255); inline ImColor BoxColor = ImColor(255, 255, 255, 255); inline ImColor EyeRayColor = ImColor(255, 0, 0, 255); @@ -67,6 +66,11 @@ namespace MenuConfig inline bool ShowDistance = true; + inline int styleee = 1; + inline int selectedStyleIndex = 0; + + inline bool EspVisCheck = true; + inline ImColor VisibleColor = ImColor(255, 255, 0, 255); } namespace CrosshairConfig diff --git a/CS2_External/OS-ImGui/OS-ImGui_Base.cpp b/CS2_External/OS-ImGui/OS-ImGui_Base.cpp index ff876a4..c966be7 100644 --- a/CS2_External/OS-ImGui/OS-ImGui_Base.cpp +++ b/CS2_External/OS-ImGui/OS-ImGui_Base.cpp @@ -34,7 +34,7 @@ namespace OSImGui iconConfig.OversampleV = 3; iconConfig.GlyphRanges = iconRanges; iconConfig.FontDataOwnedByAtlas = false; - ImFont* iconFont = fontAtlas->AddFontFromMemoryTTF((void*)rawData, sizeof(rawData), 17.f, &iconConfig, iconRanges); + ImFont* iconFont = fontAtlas->AddFontFromMemoryTTF((void*)rawData, sizeof(rawData), 16.f, &iconConfig, iconRanges); io.Fonts = fontAtlas; ImGui::StyleColorsDark(); diff --git a/CS2_External/Utils/ConfigSaver.cpp b/CS2_External/Utils/ConfigSaver.cpp index 00ed813..76d9411 100644 --- a/CS2_External/Utils/ConfigSaver.cpp +++ b/CS2_External/Utils/ConfigSaver.cpp @@ -88,12 +88,15 @@ namespace MyConfigSaver { configFile << "Gap " << CrosshairConfig::Gap << std::endl; configFile << "ShowAimFovRange " << MenuConfig::ShowAimFovRange << std::endl; configFile << "AimFovRangeColor " << MenuConfig::AimFovRangeColor.Value.x << " " << MenuConfig::AimFovRangeColor.Value.y << " " << MenuConfig::AimFovRangeColor.Value.z << " " << MenuConfig::AimFovRangeColor.Value.w << std::endl; - configFile << "BoneColorESP " << MenuConfig::BoneColorESP.Value.x << " " << MenuConfig::BoneColorESP.Value.y << " " << MenuConfig::BoneColorESP.Value.z << " " << MenuConfig::BoneColorESP.Value.w << std::endl; + configFile << "VisibleColor " << MenuConfig::VisibleColor.Value.x << " " << MenuConfig::VisibleColor.Value.y << " " << MenuConfig::VisibleColor.Value.z << " " << MenuConfig::VisibleColor.Value.w << std::endl; configFile << "OBSBypass " << MenuConfig::OBSBypass << std::endl; configFile << "BunnyHop " << MenuConfig::BunnyHop << std::endl; configFile << "BunnyHop2 " << MenuConfig::BunnyHop2 << std::endl; configFile << "ShowDistance " << MenuConfig::ShowDistance << std::endl; configFile << "RadarBgAlpha " << MenuConfig::RadarBgAlpha << std::endl; + configFile << "Style " << MenuConfig::styleee << std::endl; + configFile << "StyleIndex " << MenuConfig::selectedStyleIndex << std::endl; + configFile << "EspVisCheck " << MenuConfig::EspVisCheck << std::endl; configFile.close(); std::cout << "Configuration saved to " << filename << std::endl; } @@ -179,12 +182,14 @@ namespace MyConfigSaver { else if (key == "Gap") iss >> CrosshairConfig::Gap; else if (key == "ShowAimFovRange") iss >> MenuConfig::ShowAimFovRange; else if (key == "AimFovRangeColor") iss >> MenuConfig::AimFovRangeColor.Value.x >> MenuConfig::AimFovRangeColor.Value.y >> MenuConfig::AimFovRangeColor.Value.z >> MenuConfig::AimFovRangeColor.Value.w; - else if (key == "BoneColorESP") iss >> MenuConfig::BoneColorESP.Value.x >> MenuConfig::BoneColorESP.Value.y >> MenuConfig::BoneColorESP.Value.z >> MenuConfig::BoneColorESP.Value.w; + else if (key == "VisibleColor") iss >> MenuConfig::VisibleColor.Value.x >> MenuConfig::VisibleColor.Value.y >> MenuConfig::VisibleColor.Value.z >> MenuConfig::VisibleColor.Value.w; else if (key == "OBSBypass") iss >> MenuConfig::OBSBypass; else if (key == "BunnyHop") iss >> MenuConfig::BunnyHop; else if (key == "BunnyHop2") iss >> MenuConfig::BunnyHop2; else if (key == "ShowDistance") iss >> MenuConfig::ShowDistance; else if (key == "RadarBgAlpha") iss >> MenuConfig::RadarBgAlpha; + else if (key == "StyleIndex") iss >> MenuConfig::selectedStyleIndex; + else if (key == "EspVisCheck") iss >> MenuConfig::EspVisCheck; } } diff --git a/CS2_External/Utils/style.hpp b/CS2_External/Utils/style.hpp index 4dd2e0b..a5441f6 100644 --- a/CS2_External/Utils/style.hpp +++ b/CS2_External/Utils/style.hpp @@ -111,10 +111,10 @@ void SetupImGuiStyle2() style.FramePadding = ImVec2(6.0f, 6.0f); style.FrameRounding = 0.0f; style.FrameBorderSize = 0.0f; - style.ItemSpacing = ImVec2(12.0f, 6.0f); - style.ItemInnerSpacing = ImVec2(6.0f, 3.0f); + style.ItemSpacing = ImVec2(5.5f, 5.5f); + style.ItemInnerSpacing = ImVec2(5.5f, 5.5f); style.CellPadding = ImVec2(12.0f, 6.0f); - style.IndentSpacing = 20.0f; + style.IndentSpacing = 15.0f; style.ColumnsMinSpacing = 6.0f; style.ScrollbarSize = 12.0f; style.ScrollbarRounding = 0.0f; @@ -190,7 +190,7 @@ void SetupImGuiStyle3() style.Alpha = 1.0f; style.DisabledAlpha = 1.0f; style.WindowPadding = ImVec2(7.900000095367432f, 7.900000095367432f); - style.WindowRounding = 0.0f; + style.WindowRounding = 7.0f; style.WindowBorderSize = 0.0f; style.WindowMinSize = ImVec2(20.0f, 20.0f); style.WindowTitleAlign = ImVec2(0.5f, 0.5f);