From 19a960ab36b6a03640e8d30d8f4a59f42c7c20d7 Mon Sep 17 00:00:00 2001 From: ByteCorum <164874887+ByteCorum@users.noreply.github.com> Date: Sun, 22 Sep 2024 18:37:27 +0300 Subject: [PATCH 01/11] added proj --- todo.txt | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 todo.txt diff --git a/todo.txt b/todo.txt deleted file mode 100644 index 81f5c85..0000000 --- a/todo.txt +++ /dev/null @@ -1,37 +0,0 @@ -○ Add DefuseTimer -○ Cheat should use cs2 keys -○ Different config for each of weapon types -○ Make cheat multi-tread -○ Show bomb carrier(check all entity weapons) -○ Add GH -◎ More secure -◎ Kernel mode -◎ Fix BSOD -◎ Fix radar in menu -◎ Add logger -◎ Fix SpecList -◎ Outdate old vers -◎ Add FastStop(kicks from server) -◎ Fix Watermark -◎ Floating ESP -◎ Add Sniper Crosshire -◎ Add Bhop -◎ Improve Aimbot -◎ Make cheat portable -◎ Add Offsets auto load -◎ Add spec list -◎ Use JSON instead YAML -◎ Fixed triggerbot bug -◎ Add hit markers(mb I should del hit sound) -◎ Visible check load color bug -◎ Fix bug with aim hotkey -◎ Change button textures to more cool -◎ Add aim hitboxes to config -◎ Fix bug with trigger delay -◎ Make gui look cooler -◎ Delete junk -◎ Fix scope check -◎ Add clean button -⨂ Make menu looks nice -⨂ Refactor the code -⨂ Visible Check for Trigger \ No newline at end of file From eec603a699762e5b2858e662f9487ed6ffcbb289 Mon Sep 17 00:00:00 2001 From: ByteCorum <164874887+ByteCorum@users.noreply.github.com> Date: Mon, 23 Sep 2024 15:54:04 +0300 Subject: [PATCH 02/11] pretty radar --- DragonBurn/Config/ConfigMenu.cpp | 6 +++--- DragonBurn/Core/Cheats.cpp | 6 +++--- DragonBurn/Core/Config.h | 4 ++-- DragonBurn/Core/GUI.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/DragonBurn/Config/ConfigMenu.cpp b/DragonBurn/Config/ConfigMenu.cpp index 1384a46..b0ea04d 100644 --- a/DragonBurn/Config/ConfigMenu.cpp +++ b/DragonBurn/Config/ConfigMenu.cpp @@ -180,13 +180,13 @@ namespace ConfigMenu { MenuConfig::WorkInSpec = true; RadarCFG::ShowRadar = false; - RadarCFG::RadarRange = 150; + RadarCFG::RadarRange = 125; RadarCFG::ShowRadarCrossLine = false; RadarCFG::RadarCrossLineColor = ImColor(131, 137, 150, 180); RadarCFG::RadarType = 2; RadarCFG::RadarPointSizeProportion = 1.f; RadarCFG::RadarBgAlpha = 0.1f; - RadarCFG::Proportion = 3300; + RadarCFG::Proportion = 2700.f; LegitBotConfig::TriggerBot = true; LegitBotConfig::TriggerAlways = false; @@ -252,7 +252,7 @@ namespace ConfigMenu { LegitBotConfig::FovCircleColor = ImColor(131, 137, 150, 180); MenuConfig::MarkWinPos = ImVec2(ImGui::GetIO().DisplaySize.x - 300.0f, 100.f); - MenuConfig::RadarWinPos = ImVec2(0.f, 0.f); + MenuConfig::RadarWinPos = ImVec2(25.f, 25.f); MenuConfig::SpecWinPos = ImVec2(10.0f, ImGui::GetIO().DisplaySize.y / 2 - 200); MenuConfig::BombWinPos = ImVec2((ImGui::GetIO().DisplaySize.x - 200.0f) / 2.0f, 80.0f); diff --git a/DragonBurn/Core/Cheats.cpp b/DragonBurn/Core/Cheats.cpp index c8f2138..bde2827 100644 --- a/DragonBurn/Core/Cheats.cpp +++ b/DragonBurn/Core/Cheats.cpp @@ -299,7 +299,7 @@ void RadarSetting(Base_Radar& Radar) { // Radar window ImGui::SetNextWindowBgAlpha(RadarCFG::RadarBgAlpha); - ImGui::Begin("Radar", 0, ImGuiWindowFlags_NoResize); + ImGui::Begin("Radar", 0, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoTitleBar); ImGui::SetWindowSize({ RadarCFG::RadarRange * 2,RadarCFG::RadarRange * 2 }); ImGui::SetWindowPos(MenuConfig::RadarWinPos, ImGuiCond_Once); @@ -312,9 +312,9 @@ void RadarSetting(Base_Radar& Radar) if (!RadarCFG::customRadar) { RadarCFG::ShowRadarCrossLine = false; - RadarCFG::Proportion = 3300.f; + RadarCFG::Proportion = 2700.f; RadarCFG::RadarPointSizeProportion = 1.f; - RadarCFG::RadarRange = 150.f; + RadarCFG::RadarRange = 125.f; RadarCFG::RadarBgAlpha = 0.1f; } diff --git a/DragonBurn/Core/Config.h b/DragonBurn/Core/Config.h index 38c870b..e5e1377 100644 --- a/DragonBurn/Core/Config.h +++ b/DragonBurn/Core/Config.h @@ -146,13 +146,13 @@ namespace ESPConfig namespace RadarCFG { inline bool ShowRadar = false; - inline float RadarRange = 150; + inline float RadarRange = 125; inline float RadarPointSizeProportion = 1.f; inline bool ShowRadarCrossLine = false; inline ImColor RadarCrossLineColor = ImColor(131, 137, 150, 180); // 0: circle 1: arrow 2: circle with arrow inline int RadarType = 2; - inline float Proportion = 3300.f; + inline float Proportion = 2700.f; inline bool customRadar = false; inline float RadarBgAlpha = 0.1f; } diff --git a/DragonBurn/Core/GUI.h b/DragonBurn/Core/GUI.h index 2aab116..8f2f3d3 100644 --- a/DragonBurn/Core/GUI.h +++ b/DragonBurn/Core/GUI.h @@ -110,7 +110,7 @@ namespace GUI Gui.LoadTextureFromMemory(Images::ConfigButtonPressed, sizeof Images::ConfigButtonPressed, &MenuButton4Pressed, &buttonW, &buttonH); MenuConfig::MarkWinPos = ImVec2(ImGui::GetIO().DisplaySize.x - 300.0f, 100.f); - MenuConfig::RadarWinPos = ImVec2(0.f, 0.f); + MenuConfig::RadarWinPos = ImVec2(25.f, 25.f); MenuConfig::SpecWinPos = ImVec2(10.0f, ImGui::GetIO().DisplaySize.y / 2 - 200); MenuConfig::BombWinPos = ImVec2((ImGui::GetIO().DisplaySize.x - 200.0f) / 2.0f, 80.0f); } From 250c3f2611e21d08689183b31c301ed383b01f9c Mon Sep 17 00:00:00 2001 From: ByteCorum <164874887+ByteCorum@users.noreply.github.com> Date: Mon, 23 Sep 2024 16:22:57 +0300 Subject: [PATCH 03/11] small aim fix --- DragonBurn/Core/Cheats.cpp | 1 + DragonBurn/Features/Aimbot.cpp | 4 ++-- DragonBurn/Features/RCS.cpp | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/DragonBurn/Core/Cheats.cpp b/DragonBurn/Core/Cheats.cpp index bde2827..d8f60e2 100644 --- a/DragonBurn/Core/Cheats.cpp +++ b/DragonBurn/Core/Cheats.cpp @@ -283,6 +283,7 @@ void AIM(const CEntity& LocalEntity, std::vector AimPosList) if (!AimControl::AimBot || !AimControl::HasTarget) RCS::RecoilControl(LocalEntity); + } void MiscFuncs(CEntity& LocalEntity) diff --git a/DragonBurn/Features/Aimbot.cpp b/DragonBurn/Features/Aimbot.cpp index d3bb829..cfdf694 100644 --- a/DragonBurn/Features/Aimbot.cpp +++ b/DragonBurn/Features/Aimbot.cpp @@ -101,7 +101,7 @@ void AimControl::AimBot(const CEntity& Local, Vec3 LocalPos, std::vector& if (ScreenPos.x != ScreenCenterX) { TargetX = (ScreenPos.x > ScreenCenterX) ? -(ScreenCenterX - ScreenPos.x) : ScreenPos.x - ScreenCenterX; - TargetX /= Smooth != 0.0f ? Smooth : 1.5f; + TargetX /= Smooth != 0.0f ? Smooth : 1.0f; TargetX = (TargetX + ScreenCenterX > ScreenCenterX * 2 || TargetX + ScreenCenterX < 0) ? 0 : TargetX; } @@ -110,7 +110,7 @@ void AimControl::AimBot(const CEntity& Local, Vec3 LocalPos, std::vector& if (ScreenPos.y != ScreenCenterY) { TargetY = (ScreenPos.y > ScreenCenterY) ? -(ScreenCenterY - ScreenPos.y) : ScreenPos.y - ScreenCenterY; - TargetY /= Smooth != 0.0f ? Smooth : 1.5f; + TargetY /= Smooth != 0.0f ? Smooth : 1.0f; TargetY = (TargetY + ScreenCenterY > ScreenCenterY * 2 || TargetY + ScreenCenterY < 0) ? 0 : TargetY; } } diff --git a/DragonBurn/Features/RCS.cpp b/DragonBurn/Features/RCS.cpp index 49e26c2..51c69d3 100644 --- a/DragonBurn/Features/RCS.cpp +++ b/DragonBurn/Features/RCS.cpp @@ -1,4 +1,5 @@ #include "RCS.h" +#include "../Helpers/Logger.h" void RCS::UpdateAngles(const CEntity& Local, Vec2& Angles) { @@ -60,8 +61,10 @@ void RCS::RecoilControl(CEntity LocalPlayer) if (!LegitBotConfig::RCS) return; static Vec2 OldPunch; - if (LocalPlayer.Pawn.ShotsFired > RCSBullet && AimControl::HasTarget) + + if (LocalPlayer.Pawn.ShotsFired > RCSBullet) { + Vec2 viewAngles = LocalPlayer.Pawn.ViewAngle; Vec2 delta = viewAngles - (viewAngles + (OldPunch - (LocalPlayer.Pawn.AimPunchAngle * 2.f))); From f44a59269188b156135c4b4520cdb72ebbcd2732 Mon Sep 17 00:00:00 2001 From: ByteCorum <164874887+ByteCorum@users.noreply.github.com> Date: Mon, 23 Sep 2024 16:32:41 +0300 Subject: [PATCH 04/11] shit --- DragonBurn/Features/RCS.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/DragonBurn/Features/RCS.cpp b/DragonBurn/Features/RCS.cpp index 51c69d3..6f1d43f 100644 --- a/DragonBurn/Features/RCS.cpp +++ b/DragonBurn/Features/RCS.cpp @@ -1,5 +1,4 @@ #include "RCS.h" -#include "../Helpers/Logger.h" void RCS::UpdateAngles(const CEntity& Local, Vec2& Angles) { @@ -64,7 +63,6 @@ void RCS::RecoilControl(CEntity LocalPlayer) if (LocalPlayer.Pawn.ShotsFired > RCSBullet) { - Vec2 viewAngles = LocalPlayer.Pawn.ViewAngle; Vec2 delta = viewAngles - (viewAngles + (OldPunch - (LocalPlayer.Pawn.AimPunchAngle * 2.f))); @@ -73,7 +71,7 @@ void RCS::RecoilControl(CEntity LocalPlayer) if ((GetAsyncKeyState(VK_LBUTTON) & 0x8000)) { - mouse_event(MOUSEEVENTF_MOVE, MouseX, -MouseY, 0, 0); + mouse_event(MOUSEEVENTF_MOVE, MouseX, -MouseY, NULL, NULL); } OldPunch = LocalPlayer.Pawn.AimPunchAngle * 2.0f; From 0973e82f89e09607358cb2d78bef48f5f24febac Mon Sep 17 00:00:00 2001 From: ByteCorum <164874887+ByteCorum@users.noreply.github.com> Date: Mon, 23 Sep 2024 17:01:31 +0300 Subject: [PATCH 05/11] changed back --- DragonBurn/Features/Aimbot.cpp | 4 ++-- DragonBurn/Features/RCS.cpp | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/DragonBurn/Features/Aimbot.cpp b/DragonBurn/Features/Aimbot.cpp index cfdf694..d3bb829 100644 --- a/DragonBurn/Features/Aimbot.cpp +++ b/DragonBurn/Features/Aimbot.cpp @@ -101,7 +101,7 @@ void AimControl::AimBot(const CEntity& Local, Vec3 LocalPos, std::vector& if (ScreenPos.x != ScreenCenterX) { TargetX = (ScreenPos.x > ScreenCenterX) ? -(ScreenCenterX - ScreenPos.x) : ScreenPos.x - ScreenCenterX; - TargetX /= Smooth != 0.0f ? Smooth : 1.0f; + TargetX /= Smooth != 0.0f ? Smooth : 1.5f; TargetX = (TargetX + ScreenCenterX > ScreenCenterX * 2 || TargetX + ScreenCenterX < 0) ? 0 : TargetX; } @@ -110,7 +110,7 @@ void AimControl::AimBot(const CEntity& Local, Vec3 LocalPos, std::vector& if (ScreenPos.y != ScreenCenterY) { TargetY = (ScreenPos.y > ScreenCenterY) ? -(ScreenCenterY - ScreenPos.y) : ScreenPos.y - ScreenCenterY; - TargetY /= Smooth != 0.0f ? Smooth : 1.0f; + TargetY /= Smooth != 0.0f ? Smooth : 1.5f; TargetY = (TargetY + ScreenCenterY > ScreenCenterY * 2 || TargetY + ScreenCenterY < 0) ? 0 : TargetY; } } diff --git a/DragonBurn/Features/RCS.cpp b/DragonBurn/Features/RCS.cpp index 6f1d43f..de2a004 100644 --- a/DragonBurn/Features/RCS.cpp +++ b/DragonBurn/Features/RCS.cpp @@ -1,4 +1,5 @@ #include "RCS.h" +#include "../Helpers/Logger.h" void RCS::UpdateAngles(const CEntity& Local, Vec2& Angles) { @@ -57,12 +58,16 @@ void RCS::UpdateAngles(const CEntity& Local, Vec2& Angles) void RCS::RecoilControl(CEntity LocalPlayer) { + Log::Debug("RCS"); + if (!LegitBotConfig::RCS) return; + static Vec2 OldPunch; if (LocalPlayer.Pawn.ShotsFired > RCSBullet) { + Log::Debug("RCS IN"); Vec2 viewAngles = LocalPlayer.Pawn.ViewAngle; Vec2 delta = viewAngles - (viewAngles + (OldPunch - (LocalPlayer.Pawn.AimPunchAngle * 2.f))); @@ -75,9 +80,11 @@ void RCS::RecoilControl(CEntity LocalPlayer) } OldPunch = LocalPlayer.Pawn.AimPunchAngle * 2.0f; + Log::Debug("RCS END"); } else { + Log::Debug("RCS OUT"); OldPunch = Vec2{ 0,0 }; } } \ No newline at end of file From 73901248fa1da0957f980160215f15a761fa814a Mon Sep 17 00:00:00 2001 From: ByteCorum <164874887+ByteCorum@users.noreply.github.com> Date: Mon, 23 Sep 2024 20:25:18 +0300 Subject: [PATCH 06/11] added rcs --- DragonBurn/Config/ConfigSaver.cpp | 2 ++ DragonBurn/Core/Cheats.cpp | 5 +++-- DragonBurn/Core/GUI.h | 5 ++++- DragonBurn/Features/RCS.cpp | 7 ------- DragonBurn/Resources/Language.hpp | 1 + 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/DragonBurn/Config/ConfigSaver.cpp b/DragonBurn/Config/ConfigSaver.cpp index 251c89e..8bf1fbd 100644 --- a/DragonBurn/Config/ConfigSaver.cpp +++ b/DragonBurn/Config/ConfigSaver.cpp @@ -168,6 +168,7 @@ namespace MyConfigSaver ConfigData["RCS"]["Enable"]= LegitBotConfig::RCS; + ConfigData["RCS"]["RCSBullet"]= RCS::RCSBullet; ConfigData["RCS"]["Yaw"]= RCS::RCSScale.x; ConfigData["RCS"]["Pitch"]= RCS::RCSScale.y; @@ -391,6 +392,7 @@ namespace MyConfigSaver if (ConfigData.contains("RCS")) { LegitBotConfig::RCS = ReadData(ConfigData["RCS"],{"Enable"}, false); + RCS::RCSBullet = ReadData(ConfigData["RCS"], { "RCSBullet" }, 1); RCS::RCSScale.x = ReadData(ConfigData["RCS"],{"Yaw"}, 1.f); RCS::RCSScale.y = ReadData(ConfigData["RCS"],{"Pitch"}, 1.f); } diff --git a/DragonBurn/Core/Cheats.cpp b/DragonBurn/Core/Cheats.cpp index d8f60e2..d42723e 100644 --- a/DragonBurn/Core/Cheats.cpp +++ b/DragonBurn/Core/Cheats.cpp @@ -266,7 +266,8 @@ void AIM(const CEntity& LocalEntity, std::vector AimPosList) // Aimbot DWORD lastTick = 0; DWORD currentTick = GetTickCount64(); - if (LegitBotConfig::AimBot) { + if (LegitBotConfig::AimBot) + { Render::DrawFovCircle(LocalEntity); if (LegitBotConfig::AimAlways || GetAsyncKeyState(AimControl::HotKey)) { @@ -281,7 +282,7 @@ void AIM(const CEntity& LocalEntity, std::vector AimPosList) } } - if (!AimControl::AimBot || !AimControl::HasTarget) + if (!LegitBotConfig::AimBot) RCS::RecoilControl(LocalEntity); } diff --git a/DragonBurn/Core/GUI.h b/DragonBurn/Core/GUI.h index 8f2f3d3..56d2716 100644 --- a/DragonBurn/Core/GUI.h +++ b/DragonBurn/Core/GUI.h @@ -508,8 +508,11 @@ namespace GUI ImGui::SetCursorPosY(24.f); ImGui::SeparatorText("RCS"); float recoilMin = 0.f, recoilMax = 2.f; + int RCSBulletMin = 0, RCSBulletMax = 5; PutSwitch(Text::RCS::Toggle.c_str(), 5.f, ImGui::GetFrameHeight() * 1.7, &LegitBotConfig::RCS); - if (LegitBotConfig::RCS) { + if (LegitBotConfig::RCS) + { + PutSliderInt(Text::RCS::BulletSlider.c_str(), 5.f, &RCS::RCSBullet, &RCSBulletMin, &RCSBulletMax, "%d"); PutSliderFloat(Text::RCS::Yaw.c_str(), 5.f, &RCS::RCSScale.x, &recoilMin, &recoilMax, "%.2f"); PutSliderFloat(Text::RCS::Pitch.c_str(), 5.f, &RCS::RCSScale.y, &recoilMin, &recoilMax, "%.2f"); float scalex = (2.22 - RCS::RCSScale.x) *.5f; diff --git a/DragonBurn/Features/RCS.cpp b/DragonBurn/Features/RCS.cpp index de2a004..1d0af30 100644 --- a/DragonBurn/Features/RCS.cpp +++ b/DragonBurn/Features/RCS.cpp @@ -58,8 +58,6 @@ void RCS::UpdateAngles(const CEntity& Local, Vec2& Angles) void RCS::RecoilControl(CEntity LocalPlayer) { - Log::Debug("RCS"); - if (!LegitBotConfig::RCS) return; @@ -67,7 +65,6 @@ void RCS::RecoilControl(CEntity LocalPlayer) if (LocalPlayer.Pawn.ShotsFired > RCSBullet) { - Log::Debug("RCS IN"); Vec2 viewAngles = LocalPlayer.Pawn.ViewAngle; Vec2 delta = viewAngles - (viewAngles + (OldPunch - (LocalPlayer.Pawn.AimPunchAngle * 2.f))); @@ -80,11 +77,7 @@ void RCS::RecoilControl(CEntity LocalPlayer) } OldPunch = LocalPlayer.Pawn.AimPunchAngle * 2.0f; - Log::Debug("RCS END"); } else - { - Log::Debug("RCS OUT"); OldPunch = Vec2{ 0,0 }; - } } \ No newline at end of file diff --git a/DragonBurn/Resources/Language.hpp b/DragonBurn/Resources/Language.hpp index d12acfb..0d95a6e 100644 --- a/DragonBurn/Resources/Language.hpp +++ b/DragonBurn/Resources/Language.hpp @@ -61,6 +61,7 @@ namespace Text { namespace RCS { + inline std::string BulletSlider = "Start Bullet:"; inline std::string Toggle = "Recoil Control"; inline std::string Yaw = "Yaw: "; inline std::string Pitch = "Pitch: "; From 9c3faa97926a1bd353f8ea987194bab0e3d8c19f Mon Sep 17 00:00:00 2001 From: ByteCorum <164874887+ByteCorum@users.noreply.github.com> Date: Tue, 24 Sep 2024 15:55:37 +0300 Subject: [PATCH 07/11] https://github.com/users/ByteCorum/projects/1?pane=issue&itemId=80642424 --- DragonBurn/Config/ConfigMenu.cpp | 19 +++--- DragonBurn/Config/ConfigSaver.cpp | 16 +++-- DragonBurn/Core/Cheats.cpp | 2 +- DragonBurn/Core/Config.h | 3 +- DragonBurn/Core/GUI.h | 29 +++++--- DragonBurn/DragonBurn.vcxproj | 1 + DragonBurn/DragonBurn.vcxproj.filters | 1 + DragonBurn/Features/Aimbot.cpp | 6 -- DragonBurn/Features/Aimbot.h | 4 +- DragonBurn/Features/TriggerBot.h | 8 +-- DragonBurn/Helpers/KeyManager.h | 97 +++++++++++++++++++++++++++ DragonBurn/Resources/Language.hpp | 4 ++ 12 files changed, 149 insertions(+), 41 deletions(-) create mode 100644 DragonBurn/Helpers/KeyManager.h diff --git a/DragonBurn/Config/ConfigMenu.cpp b/DragonBurn/Config/ConfigMenu.cpp index b0ea04d..c2544a7 100644 --- a/DragonBurn/Config/ConfigMenu.cpp +++ b/DragonBurn/Config/ConfigMenu.cpp @@ -7,6 +7,7 @@ #include #include "../Resources/Language.hpp" #include "../Features/RCS.h" +#include "../Helpers/KeyManager.h" namespace ConfigMenu { @@ -64,8 +65,8 @@ namespace ConfigMenu { ImGui::OpenPopup("##reallyDelete"); if (ImGui::BeginPopup("##reallyDelete")) { - ImGui::TextUnformatted(" Are you sure? "); - ImGui::TextUnformatted(" "); + ImGui::Text(" Are you sure? "); + ImGui::Text(" "); ImGui::SameLine(); if (ImGui::Button("No", { 40.0f, 0.0f })) ImGui::CloseCurrentPopup(); @@ -89,8 +90,8 @@ namespace ConfigMenu { ImGui::OpenPopup("##reallyReset"); if (ImGui::BeginPopup("##reallyReset")) { - ImGui::TextUnformatted(" Are you sure? "); - ImGui::TextUnformatted(" "); + ImGui::Text(" Are you sure? "); + ImGui::Text(" "); ImGui::SameLine(); if (ImGui::Button("No", { 40.0f, 0.0f })) ImGui::CloseCurrentPopup(); @@ -190,6 +191,8 @@ namespace ConfigMenu { LegitBotConfig::TriggerBot = true; LegitBotConfig::TriggerAlways = false; + TriggerBot::HotKey = 6; + Text::Trigger::HotKey = KeyMgr::GetKeyName(TriggerBot::HotKey); MenuConfig::TeamCheck = true; MenuConfig::BypassOBS = false; @@ -198,8 +201,8 @@ namespace ConfigMenu { MiscCFG::ShowHeadShootLine = false; MiscCFG::HeadShootLineColor = ImColor(131, 137, 150, 200); - LegitBotConfig::AimBotHotKey = 3; - AimControl::SetHotKey(LegitBotConfig::AimBotHotKey); + AimControl::HotKey = 1; + Text::Aimbot::HotKey = KeyMgr::GetKeyName(AimControl::HotKey); AimControl::AimFov = 10; AimControl::AimFovMin = 0.4f; AimControl::Smooth = 5.0f; @@ -210,8 +213,6 @@ namespace ConfigMenu { TriggerBot::ShotDuration = 400; RCS::RCSBullet = 1; - LegitBotConfig::TriggerHotKey = 4; - TriggerBot::SetHotKey(LegitBotConfig::TriggerHotKey); RCS::RCSScale = ImVec2(1.4f, 1.4f); AimControl::ScopeOnly = true; @@ -261,5 +262,7 @@ namespace ConfigMenu { MenuConfig::RadarWinChengePos = true; MenuConfig::SpecWinChengePos = true; + MenuConfig::HotKey = VK_END; + } } diff --git a/DragonBurn/Config/ConfigSaver.cpp b/DragonBurn/Config/ConfigSaver.cpp index 8bf1fbd..62d1d31 100644 --- a/DragonBurn/Config/ConfigSaver.cpp +++ b/DragonBurn/Config/ConfigSaver.cpp @@ -8,6 +8,7 @@ #include "../Features/TriggerBot.h" #include "../Features/Aimbot.h" #include "../Features/RCS.h" +#include "../Helpers/KeyManager.h" #include using json = nlohmann::json; @@ -148,7 +149,7 @@ namespace MyConfigSaver ConfigData["Aimbot"]["Enable"]= LegitBotConfig::AimBot; ConfigData["Aimbot"]["ToggleMode"]= LegitBotConfig::AimToggleMode; - ConfigData["Aimbot"]["Hotkey"]= LegitBotConfig::AimBotHotKey; + ConfigData["Aimbot"]["Hotkey"]= AimControl::HotKey; ConfigData["Aimbot"]["AimBullet"]= AimControl::AimBullet; ConfigData["Aimbot"]["Fov"]= AimControl::AimFov; ConfigData["Aimbot"]["FovMin"]= AimControl::AimFovMin; @@ -175,7 +176,7 @@ namespace MyConfigSaver ConfigData["Triggerbot"]["Enable"]= LegitBotConfig::TriggerBot; - ConfigData["Triggerbot"]["Hotkey"]= LegitBotConfig::TriggerHotKey; + ConfigData["Triggerbot"]["Hotkey"]= TriggerBot::HotKey; ConfigData["Triggerbot"]["Delay"]= TriggerBot::TriggerDelay; ConfigData["Triggerbot"]["FakeShot"]= TriggerBot::ShotDuration; ConfigData["Triggerbot"]["ScopeOnly"]= TriggerBot::ScopeOnly; @@ -213,6 +214,7 @@ namespace MyConfigSaver ConfigData["Misc"]["TeamCheck"]= MenuConfig::TeamCheck; ConfigData["Misc"]["AntiRecord"]= MenuConfig::BypassOBS; + ConfigData["Misc"]["MenuKey"] = MenuConfig::HotKey; ConfigData["MenuConfig"]["MarkWinPos"]["x"] = MenuConfig::MarkWinPos.x; ConfigData["MenuConfig"]["MarkWinPos"]["y"] = MenuConfig::MarkWinPos.y; @@ -371,7 +373,7 @@ namespace MyConfigSaver { LegitBotConfig::AimBot = ReadData(ConfigData["Aimbot"],{"Enable"}, false); LegitBotConfig::AimToggleMode = ReadData(ConfigData["Aimbot"],{"ToggleMode"}, false); - LegitBotConfig::AimBotHotKey = ReadData(ConfigData["Aimbot"],{"Hotkey"}, 0); + AimControl::HotKey = ReadData(ConfigData["Aimbot"],{"Hotkey"}, 0); AimControl::AimBullet = ReadData(ConfigData["Aimbot"],{"AimBullet"}, 0); AimControl::AimFov = ReadData(ConfigData["Aimbot"],{"Fov"}, 5.f); AimControl::AimFovMin = ReadData(ConfigData["Aimbot"],{"FovMin"}, .5f); @@ -385,7 +387,7 @@ namespace MyConfigSaver LegitBotConfig::VisibleCheck = ReadData(ConfigData["Aimbot"],{"VisibleCheck"}, true); AimControl::IgnoreFlash = ReadData(ConfigData["Aimbot"],{"IgnoreFlash"}, false); AimControl::ScopeOnly = ReadData(ConfigData["Aimbot"],{"ScopeOnly"}, false); - AimControl::SetHotKey(LegitBotConfig::AimBotHotKey); + Text::Aimbot::HotKey = KeyMgr::GetKeyName(AimControl::HotKey); LegitBotConfig::HitboxUpdated = false; } @@ -400,13 +402,13 @@ namespace MyConfigSaver if (ConfigData.contains("Triggerbot")) { LegitBotConfig::TriggerBot = ReadData(ConfigData["Triggerbot"],{"Enable"}, false); - LegitBotConfig::TriggerHotKey = ReadData(ConfigData["Triggerbot"],{"Hotkey"}, 0); + TriggerBot::HotKey = ReadData(ConfigData["Triggerbot"],{"Hotkey"}, 6); TriggerBot::TriggerDelay = ReadData(ConfigData["Triggerbot"],{"Delay"}, 20); TriggerBot::ShotDuration = ReadData(ConfigData["Triggerbot"],{"FakeShot"}, 200); TriggerBot::ScopeOnly = ReadData(ConfigData["Triggerbot"],{"ScopeOnly"}, false); TriggerBot::IgnoreFlash = ReadData(ConfigData["Triggerbot"],{"IgnoreFlash"}, false); LegitBotConfig::TriggerAlways = ReadData(ConfigData["Triggerbot"],{"AutoMode"}, false); - TriggerBot::SetHotKey(LegitBotConfig::TriggerHotKey); + Text::Trigger::HotKey = KeyMgr::GetKeyName(TriggerBot::HotKey); } if (ConfigData.contains("Misc")) @@ -435,6 +437,8 @@ namespace MyConfigSaver MiscCFG::SniperCrosshairColor.Value.w = ReadData(ConfigData["Misc"], { "SniperCrosshairColor","a" }, 255.f); MenuConfig::TeamCheck = ReadData(ConfigData["Misc"],{"TeamCheck"}, true); MenuConfig::BypassOBS = ReadData(ConfigData["Misc"],{"AntiRecord"}, false); + MenuConfig::HotKey = ReadData(ConfigData["Misc"], { "MenuKey" }, VK_END); + Text::Misc::HotKey = KeyMgr::GetKeyName(MenuConfig::HotKey); } if (ConfigData.contains("MenuConfig")) diff --git a/DragonBurn/Core/Cheats.cpp b/DragonBurn/Core/Cheats.cpp index d42723e..8033719 100644 --- a/DragonBurn/Core/Cheats.cpp +++ b/DragonBurn/Core/Cheats.cpp @@ -210,7 +210,7 @@ void Menu() { std::chrono::time_point now = std::chrono::system_clock::now(); std::chrono::duration difference = now - timepoint; - SHORT keyState = GetAsyncKeyState(VK_END); + SHORT keyState = GetAsyncKeyState(MenuConfig::HotKey); if (keyState & 0x8000) { keyWasPressed = true; } diff --git a/DragonBurn/Core/Config.h b/DragonBurn/Core/Config.h index e5e1377..a4131ba 100644 --- a/DragonBurn/Core/Config.h +++ b/DragonBurn/Core/Config.h @@ -44,6 +44,7 @@ namespace MenuConfig inline bool RadarWinChengePos = false; inline bool SpecWinChengePos = false; inline bool BombWinChengePos = false; + inline int HotKey = VK_END; } namespace LegitBotConfig @@ -51,7 +52,6 @@ namespace LegitBotConfig inline bool AimBot = true; inline bool AimAlways = false; inline bool AimToggleMode = false; - inline int AimBotHotKey = 3; // 0: head 1: neck 3: spine inline int AimPosition = 0; inline DWORD AimPositionIndex = BONEINDEX::head; @@ -64,7 +64,6 @@ namespace LegitBotConfig inline bool TriggerBot = true; inline bool TriggerAlways = false; - inline int TriggerHotKey = 4; inline bool RCS = false; diff --git a/DragonBurn/Core/GUI.h b/DragonBurn/Core/GUI.h index 56d2716..192dac0 100644 --- a/DragonBurn/Core/GUI.h +++ b/DragonBurn/Core/GUI.h @@ -10,6 +10,7 @@ #include "..\Resources\Language.hpp" #include "..\Resources\Images.hpp" +#include "../Helpers/KeyManager.h" ID3D11ShaderResourceView* Logo = NULL; ID3D11ShaderResourceView* MenuButton1 = NULL; @@ -426,11 +427,12 @@ namespace GUI ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 10.f); ImGui::TextDisabled(Text::Aimbot::HotKeyList.c_str()); ImGui::SameLine(); - AlignRight(160.f); - ImGui::SetNextItemWidth(160.f); - if (ImGui::Combo("###AimKey", &LegitBotConfig::AimBotHotKey, "LALT\0LBUTTON\0RBUTTON\0XBUTTON1\0XBUTTON2\0CAPITAL\0SHIFT\0CONTROL\0")) + AlignRight(70.f); + if (ImGui::Button(Text::Aimbot::HotKey.c_str(), { 70.f, 25.f })) { - AimControl::SetHotKey(LegitBotConfig::AimBotHotKey); + std::thread([&]() { + KeyMgr::GetPressedKey(AimControl::HotKey, Text::Aimbot::HotKey); + }).detach(); } PutSliderInt(Text::Aimbot::BulletSlider.c_str(), 10.f, &AimControl::AimBullet, &BulletMin, &BulletMax, "%d"); PutSwitch(Text::Aimbot::Toggle.c_str(), 10.f, ImGui::GetFrameHeight() * 1.7, &LegitBotConfig::AimToggleMode); @@ -561,6 +563,7 @@ namespace GUI ImGui::SeparatorText("Triggerbot"); int DelayMin = 0, DelayMax = 300; int DurationMin = 0, DurationMax = 1000; + PutSwitch(Text::Trigger::Enable.c_str(), 5.f, ImGui::GetFrameHeight() * 1.7, &LegitBotConfig::TriggerBot); if (LegitBotConfig::TriggerBot) { @@ -569,11 +572,12 @@ namespace GUI ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 5.f); ImGui::TextDisabled(Text::Trigger::HotKeyList.c_str()); ImGui::SameLine(); - AlignRight(160.f); - ImGui::SetNextItemWidth(160.f); - if (ImGui::Combo("###TriggerbotKey", &LegitBotConfig::TriggerHotKey, "LALT\0RBUTTON\0XBUTTON1\0XBUTTON2\0CAPITAL\0SHIFT\0CONTROL\0")) + AlignRight(70.f); + if (ImGui::Button(Text::Trigger::HotKey.c_str(), {70.f, 25.f})) { - TriggerBot::SetHotKey(LegitBotConfig::TriggerHotKey); + std::thread([&]() { + KeyMgr::GetPressedKey(TriggerBot::HotKey, Text::Trigger::HotKey); + }).detach(); } } PutSwitch(Text::Trigger::Toggle.c_str(), 5.f, ImGui::GetFrameHeight() * 1.7, &LegitBotConfig::TriggerAlways); @@ -612,6 +616,15 @@ namespace GUI ImGui::NextColumn(); ImGui::SetCursorPosY(24.f); ImGui::SeparatorText("Global Settings"); + ImGui::TextDisabled(Text::Misc::MenuKey.c_str()); + ImGui::SameLine(); + AlignRight(70.f); + if (ImGui::Button(Text::Misc::HotKey.c_str(), { 70.f, 25.f })) + { + std::thread([&]() { + KeyMgr::GetPressedKey(MenuConfig::HotKey, Text::Misc::HotKey); + }).detach(); + } PutSwitch(Text::Misc::SpecCheck.c_str(), 5.f, ImGui::GetFrameHeight() * 1.7, &MenuConfig::WorkInSpec); PutSwitch(Text::Misc::TeamCheck.c_str(), 5.f, ImGui::GetFrameHeight() * 1.7, &MenuConfig::TeamCheck); PutSwitch(Text::Misc::AntiRecord.c_str(), 5.f, ImGui::GetFrameHeight() * 1.7, &MenuConfig::BypassOBS); diff --git a/DragonBurn/DragonBurn.vcxproj b/DragonBurn/DragonBurn.vcxproj index 7b04bd0..0629f8d 100644 --- a/DragonBurn/DragonBurn.vcxproj +++ b/DragonBurn/DragonBurn.vcxproj @@ -193,6 +193,7 @@ + diff --git a/DragonBurn/DragonBurn.vcxproj.filters b/DragonBurn/DragonBurn.vcxproj.filters index d0f2bcb..eeeef01 100644 --- a/DragonBurn/DragonBurn.vcxproj.filters +++ b/DragonBurn/DragonBurn.vcxproj.filters @@ -186,6 +186,7 @@ Core + diff --git a/DragonBurn/Features/Aimbot.cpp b/DragonBurn/Features/Aimbot.cpp index d3bb829..425c526 100644 --- a/DragonBurn/Features/Aimbot.cpp +++ b/DragonBurn/Features/Aimbot.cpp @@ -1,11 +1,5 @@ #include "Aimbot.h" - -void AimControl::SetHotKey(int Index) -{ - HotKey = HotKeyList.at(Index); -} - void AimControl::switchToggle() { LegitBotConfig::AimAlways = !LegitBotConfig::AimAlways; diff --git a/DragonBurn/Features/Aimbot.h b/DragonBurn/Features/Aimbot.h index 8a6ab3e..c5af747 100644 --- a/DragonBurn/Features/Aimbot.h +++ b/DragonBurn/Features/Aimbot.h @@ -20,7 +20,7 @@ extern "C" { namespace AimControl { - inline int HotKey = VK_XBUTTON1; + inline int HotKey = VK_LBUTTON; inline int AimBullet = 1; inline bool ScopeOnly = true; inline bool IgnoreFlash = false; @@ -28,11 +28,9 @@ namespace AimControl inline float AimFovMin = 0.4f; inline float Smooth = 5.0f; inline std::vector HitboxList{ BONEINDEX::head }; - inline std::vector HotKeyList{ VK_LMENU, VK_LBUTTON, VK_RBUTTON, VK_XBUTTON1, VK_XBUTTON2, VK_CAPITAL, VK_LSHIFT, VK_LCONTROL }; inline bool HasTarget = false; void AimBot(const CEntity& Local, Vec3 LocalPos, std::vector& AimPosList); void switchToggle(); - void SetHotKey(int Index); } diff --git a/DragonBurn/Features/TriggerBot.h b/DragonBurn/Features/TriggerBot.h index df47a3a..c72bf58 100644 --- a/DragonBurn/Features/TriggerBot.h +++ b/DragonBurn/Features/TriggerBot.h @@ -11,18 +11,12 @@ namespace TriggerBot inline int ShotDuration = 400; // ms inline bool ScopeOnly = true; inline bool IgnoreFlash = false; - inline int HotKey = VK_CAPITAL; - inline std::vector HotKeyList{VK_LMENU, VK_RBUTTON, VK_XBUTTON1, VK_XBUTTON2, VK_CAPITAL, VK_LSHIFT, VK_LCONTROL}; + inline int HotKey = VK_XBUTTON2; inline std::chrono::time_point timepoint = std::chrono::system_clock::now(); inline std::chrono::time_point startTime = std::chrono::system_clock::now(); inline bool recorded = false; inline bool VisibleCheck = true; - inline void SetHotKey(int Index) - { - HotKey = HotKeyList.at(Index); - } - // Triggerbot void Run(const CEntity& LocalEntity); //void TargetCheck(const CEntity& LocalEntity) noexcept; diff --git a/DragonBurn/Helpers/KeyManager.h b/DragonBurn/Helpers/KeyManager.h new file mode 100644 index 0000000..351c760 --- /dev/null +++ b/DragonBurn/Helpers/KeyManager.h @@ -0,0 +1,97 @@ +#pragma once +#include +#include + +namespace KeyMgr +{ + inline std::string GetKeyName(int vk_code) + { + switch (vk_code) + { + case VK_LBUTTON: return "LMB"; + case VK_RBUTTON: return "RMB"; + case VK_CANCEL: return "Cancel"; + case VK_MBUTTON: return "MMB"; + case VK_XBUTTON1: return "X1MB"; + case VK_XBUTTON2: return "X2MB"; + case VK_BACK: return "Return"; + case VK_TAB: return "Tab"; + case VK_RETURN: return "Enter"; + case VK_SHIFT: return "Shift"; + case VK_CONTROL: return "Control"; + case VK_MENU: return "Alt"; + case VK_PAUSE: return "Pause"; + case VK_CAPITAL: return "Caps"; + case VK_ESCAPE: return "Escape"; + case VK_SPACE: return "Space"; + case VK_LEFT: return "Left"; + case VK_UP: return "Up"; + case VK_RIGHT: return "Right"; + case VK_DOWN: return "Down"; + case VK_PRINT: return "Prt Scr"; + case VK_INSERT: return "Insert"; + case VK_DELETE: return "Delete"; + case VK_HOME: return "Home"; + case VK_END: return "End"; + case VK_PRIOR: return "Pg Up"; + case VK_NEXT: return "Pg Down"; + case VK_F1: return "F1"; + case VK_F2: return "F2"; + case VK_F3: return "F3"; + case VK_F4: return "F4"; + case VK_F5: return "F5"; + case VK_F6: return "F6"; + case VK_F7: return "F7"; + case VK_F8: return "F8"; + case VK_F9: return "F9"; + case VK_F10: return "F10"; + case VK_F11: return "F11"; + case VK_F12: return "F12"; + default: + { + char name[16]; + BYTE keyboardState[256]; + GetKeyboardState(keyboardState); + UINT scanCode = MapVirtualKey(vk_code, MAPVK_VK_TO_VSC); + int result = ToUnicode(vk_code, scanCode, keyboardState, reinterpret_cast(name), sizeof(name) / sizeof(name[0]), 0); + if (result > 0) + { + name[result] = '\0'; + return std::string(name); + } + return "N/A"; + } + } + } + + inline void GetPressedKey(int& vk_code, std::string& keyName) + { + int hotkey; + std::string buff = keyName; + keyName = "..."; + while (true) + { + + for (int key = 0; key < 256; key++) + { + if (GetAsyncKeyState(key) & 0x8000) + { + hotkey = key; + } + } + if (hotkey == MenuConfig::HotKey) + { + keyName = buff; + break; + } + + + if (hotkey > 0 && hotkey < 256 ) + { + vk_code = hotkey; + keyName = GetKeyName(hotkey); + break; + } + } + } +} \ No newline at end of file diff --git a/DragonBurn/Resources/Language.hpp b/DragonBurn/Resources/Language.hpp index 0d95a6e..7fe29c5 100644 --- a/DragonBurn/Resources/Language.hpp +++ b/DragonBurn/Resources/Language.hpp @@ -45,6 +45,7 @@ namespace Text { inline std::string Enable = "Enable Aimbot"; inline std::string FeatureName = "Aimbot"; inline std::string HotKeyList = "Hotkey"; + inline std::string HotKey = "LMB"; inline std::string Toggle = "Toggle Mode"; inline std::string DrawFov = "Show Fov"; inline std::string VisCheck = "Visible Check"; @@ -85,6 +86,7 @@ namespace Text { inline std::string Enable = "Enable Triggerbot"; inline std::string FeatureName = "Triggerbot"; inline std::string HotKeyList = "Hotkey"; + inline std::string HotKey = "X2MB"; inline std::string Toggle = "Always Active"; inline std::string ScopeOnly = "Scope Only"; inline std::string DelaySlider = "Shot Delay:"; @@ -95,6 +97,8 @@ namespace Text { namespace Misc { inline std::string FeatureName = "Misc"; + inline std::string MenuKey = " Menu Key"; + inline std::string HotKey = "End"; inline std::string StyleList = "Style"; inline std::string HeadshotLine = "Headshot Line"; inline std::string SpecCheck = "Work in Spec"; From de6a639735016a4fdf1169b572d65080bf5288cf Mon Sep 17 00:00:00 2001 From: ByteCorum <164874887+ByteCorum@users.noreply.github.com> Date: Tue, 24 Sep 2024 17:29:33 +0300 Subject: [PATCH 08/11] added defuse and bomb color --- DragonBurn/Features/BombTimer.h | 59 ++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/DragonBurn/Features/BombTimer.h b/DragonBurn/Features/BombTimer.h index 2975ed9..1d3aa9a 100644 --- a/DragonBurn/Features/BombTimer.h +++ b/DragonBurn/Features/BombTimer.h @@ -24,12 +24,10 @@ namespace bmb { int site; uintptr_t cPlantedC4; - //memoryManager.ReadMemory(gGame.GetClientDLLAddress() + Offset.PlantedC4, cPlantedC4); if (!memoryManager.ReadMemory(gGame.GetClientDLLAddress() + Offset.PlantedC4, cPlantedC4)) return 0; if (!memoryManager.ReadMemory(cPlantedC4, cPlantedC4)) return 0; - if (!memoryManager.ReadMemory(cPlantedC4 + Offset.C4.m_nBombSite, site)) return 0; @@ -45,12 +43,17 @@ namespace bmb if ((!MiscCFG::bmbTimer || inGame == 0) && !(MiscCFG::bmbTimer && MenuConfig::ShowMenu)) return; + uintptr_t bomb; bool isBombPlanted; bool IsBeingDefused; float DefuseTime; - auto plantedAddress = gGame.GetClientDLLAddress() + Offset.PlantedC4 - 0x8; + float defuseRemaining; + ImColor color = MiscCFG::BombTimerCol; + auto plantedAddress = gGame.GetClientDLLAddress() + Offset.PlantedC4; - memoryManager.ReadMemory(plantedAddress, isBombPlanted); + memoryManager.ReadMemory(plantedAddress, bomb); + memoryManager.ReadMemory(bomb, bomb); + memoryManager.ReadMemory(plantedAddress - 0x8, isBombPlanted); auto time = currentTimeMillis(); @@ -60,8 +63,8 @@ namespace bmb plantTime = time; } - //memoryManager.ReadMemory(Offset.PlantedC4 + Offset.C4.m_flDefuseCountDown, IsBeingDefused); - //memoryManager.ReadMemory(Offset.PlantedC4 + Offset.C4.m_flDefuseCountDown, DefuseTime); + memoryManager.ReadMemory(bomb + Offset.C4.m_bBeingDefused, IsBeingDefused); + memoryManager.ReadMemory(bomb + Offset.C4.m_flDefuseCountDown, DefuseTime); if (!isPlanted && !MenuConfig::ShowMenu) return; @@ -81,32 +84,28 @@ namespace bmb float remaining = (40000 - (int64_t)time + plantTime) / (float)1000; - /* - if (remaining > 10 || remaining < 0 || !isPlanted) - { - ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(0, 196, 0, 255)); - } - else if (remaining > 5) - { - ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(255, 155, 0, 255)); - } - else { - ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(242, 93, 93, 255)); - }*/ - ImGui::SetCursorPosX((ImGui::GetWindowSize().x - 180) * 0.5f); float barLength = remaining <= 0.0f ? 0.0f : remaining >= 40 ? 1.0f : (remaining / 40.0f); if (isPlanted && remaining >= 0) { + if (remaining <= 10 && !IsBeingDefused) + { + color = ImColor(113, 34, 51); + } + else if (IsBeingDefused) + { + color = ImColor(32, 178, 170); + } + else + { + color = MiscCFG::BombTimerCol; + } + std::ostringstream ss; ss.precision(3); ss << "Bomb on " << (!getBombSite(isBombPlanted) ? "A" : "B") << ": " << std::fixed << remaining << " s"; - //std::ostringstream test; - //test.precision(3); - //test << IsBeingDefused << ", " << DefuseTime; Gui.MyText(std::move(ss).str().c_str(), true); - //Gui.MyText(std::move(test).str().c_str(), true); } else { Gui.MyText("C4 not planted", true); @@ -114,13 +113,21 @@ namespace bmb } ImGui::TextUnformatted(" "); ImGui::SameLine(); - Gui.MyProgressBar(barLength, { 180, 15 }, "", MiscCFG::BombTimerCol); - + Gui.MyProgressBar(barLength, { 180, 15 }, "", color); + //if (isPlanted && remaining >= 0 && IsBeingDefused) + //{ + // ImVec2 progressBarPos = ImGui::GetCursorPos(); + // ImGui::SetCursorPos(ImVec2(progressBarPos.x + 45, progressBarPos.y - 27)); + + // std::ostringstream defuseSS; + // defuseSS.precision(2); + // defuseSS << "Defusing: " << std::fixed << defuseRemaining << " s"; + // ImGui::Text(defuseSS.str().c_str()); + //} if (isPlanted && !isBombPlanted) { isPlanted = false; } - //ImGui::PopStyleColor(); MenuConfig::BombWinPos = ImGui::GetWindowPos(); ImGui::End(); } From ccb1040e483f81b904ac7061456f231b7ba90c58 Mon Sep 17 00:00:00 2001 From: ByteCorum <164874887+ByteCorum@users.noreply.github.com> Date: Tue, 24 Sep 2024 17:37:06 +0300 Subject: [PATCH 09/11] Update BombTimer.h --- DragonBurn/Features/BombTimer.h | 1 + 1 file changed, 1 insertion(+) diff --git a/DragonBurn/Features/BombTimer.h b/DragonBurn/Features/BombTimer.h index 1d3aa9a..c7ddca6 100644 --- a/DragonBurn/Features/BombTimer.h +++ b/DragonBurn/Features/BombTimer.h @@ -121,6 +121,7 @@ namespace bmb // std::ostringstream defuseSS; // defuseSS.precision(2); + // defuseRemaining = plantTime - DefuseTime; // defuseSS << "Defusing: " << std::fixed << defuseRemaining << " s"; // ImGui::Text(defuseSS.str().c_str()); //} From b42a32d01a925600f027b51febdf96175f395fd2 Mon Sep 17 00:00:00 2001 From: ByteCorum <164874887+ByteCorum@users.noreply.github.com> Date: Tue, 24 Sep 2024 21:04:05 +0300 Subject: [PATCH 10/11] new ver --- DragonBurn/Core/Config.h | 2 +- DragonBurn/Resources/Resource.rc | Bin 6584 -> 6584 bytes README.md | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DragonBurn/Core/Config.h b/DragonBurn/Core/Config.h index a4131ba..adc1b98 100644 --- a/DragonBurn/Core/Config.h +++ b/DragonBurn/Core/Config.h @@ -5,7 +5,7 @@ namespace MenuConfig { inline std::string name = "DragonBurn"; - inline std::string version = "2.0.3.0"; + inline std::string version = "2.0.4.0"; inline std::string author = "ByteCorum"; inline std::string path = ""; diff --git a/DragonBurn/Resources/Resource.rc b/DragonBurn/Resources/Resource.rc index 6b2c72af86b8de5928fb23aa0372dfc527ac43f9..fa378bc2a568cd704a0c00df35ddc5bc6e613437 100644 GIT binary patch delta 37 ncmdmCyu)}ygdnpCgWhCce#yxX_{BDN3BF>432dGqtic8V432dGqtic8V - + From f8e6a7a8de8979baed474c6fb8080f599a1e0c3e Mon Sep 17 00:00:00 2001 From: ByteCorum <164874887+ByteCorum@users.noreply.github.com> Date: Tue, 24 Sep 2024 21:05:44 +0300 Subject: [PATCH 11/11] Update Resource.rc --- DragonBurn/Resources/Resource.rc | Bin 6584 -> 6584 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/DragonBurn/Resources/Resource.rc b/DragonBurn/Resources/Resource.rc index fa378bc2a568cd704a0c00df35ddc5bc6e613437..89f997a4a1171fe3bfdb1e7168c9eb77a093a1c9 100644 GIT binary patch delta 20 bcmdmCyu)~d123b=WJlgqMw89Uc?Ed@NU8=1 delta 20 bcmdmCyu)~d123cTWJlgqM&r%Pc?Ed@NSFo&