Reviewed #30 pull request

- Added customizable colors in the configuration
- Cleaned code just a bit
- Updated offsets to the latest game version

Thnaks @ifBars for great ideas in with his pull request
This commit is contained in:
IMXNOOBX
2023-10-12 12:50:49 +02:00
parent 61940cb6cc
commit 889cee1aa0
7 changed files with 283 additions and 275 deletions
+2 -4
View File
@@ -19,8 +19,6 @@ namespace updater {
std::tm commit_date = {};
std::istringstream(last_commit_date) >> std::get_time(&commit_date, "%Y-%m-%dT%H:%M:%SZ");
auto currentTime = std::chrono::system_clock::now();
std::chrono::system_clock::time_point commitTimePoint = std::chrono::system_clock::from_time_t(std::mktime(&commit_date));
if (file_good("offsets.json")) {
@@ -31,7 +29,7 @@ namespace updater {
// Check if the local file is older than the last GitHub commit
if (lastModifiedClockTime < commitTimePoint) {
std::cout << "[updater] Local file is older than the last GitHub commit." << std::endl;
char response;
if (!automatic_update) {
std::cout << "[updater] Do you want to download the latest offsets? (y/n): ";
@@ -47,7 +45,7 @@ namespace updater {
std::cout << "[updater] Error: Failed to download file, try downloading manually from " << raw_updated_offets << "\n" << std::endl;
}
}
}
else {
std::cout << "[updater] Local file is up to date.\n" << std::endl;
+5 -5
View File
@@ -27,13 +27,13 @@ namespace updater {
extern bool read();
extern void save();
inline std::string github_repo_api = "https://api.github.com/repos/IMXNOOBX/cs2-external-esp/commits";
inline std::string raw_updated_offets = "https://github.com/IMXNOOBX/cs2-external-esp/raw/main/offsets/offsets.json";
const inline std::string github_repo_api = "https://api.github.com/repos/IMXNOOBX/cs2-external-esp/commits";
const inline std::string raw_updated_offets = "https://github.com/IMXNOOBX/cs2-external-esp/raw/main/offsets/offsets.json";
namespace offsets {
inline std::ptrdiff_t dwLocalPlayer = 0x187AC48;
inline std::ptrdiff_t dwEntityList = 0x178D8E8;
inline std::ptrdiff_t dwViewMatrix = 0x187B730;
inline std::ptrdiff_t dwLocalPlayer = 0x1877CF8;
inline std::ptrdiff_t dwEntityList = 0x178A808;
inline std::ptrdiff_t dwViewMatrix = 0x18787E0;
inline std::ptrdiff_t m_iPawnArmor = 0x80c;
inline std::ptrdiff_t dwPawnHealth = 0x808;
+61 -16
View File
@@ -26,16 +26,53 @@ namespace config {
automatic_update = data["automatic_update"];
if (data["render_distance"].is_number())
render_distance = data["render_distance"];
if (data["show_distance"].is_boolean())
show_distance = data["show_distance"];
if (data["show_armor"].is_boolean())
show_armor = data["show_armor"];
if (data["rainbow"].is_boolean())
rainbow = data["rainbow"];
if (data["rainbow_speed"].is_number())
rainbow_speed = data["rainbow_speed"];
if (data["head_tracker"].is_boolean())
head_tracker = data["head_tracker"];
if (data["flag_render_distance"].is_number())
flag_render_distance = data["flag_render_distance"];
if (data["show_extra_flags"].is_boolean())
show_extra_flags = data["show_extra_flags"];
if (data.find("esp_box_color_team") != data.end()) {
esp_box_color_team = {
data["esp_box_color_team"][0].get<int>(),
data["esp_box_color_team"][1].get<int>(),
data["esp_box_color_team"][2].get<int>()
};
}
if (data.find("esp_box_color_enemy") != data.end()) {
esp_box_color_enemy = {
data["esp_box_color_enemy"][0].get<int>(),
data["esp_box_color_enemy"][1].get<int>(),
data["esp_box_color_enemy"][2].get<int>()
};
}
if (data.find("esp_name_color") != data.end()) {
esp_name_color = {
data["esp_name_color"][0].get<int>(),
data["esp_name_color"][1].get<int>(),
data["esp_name_color"][2].get<int>()
};
}
if (data.find("esp_distance_color") != data.end()) {
esp_distance_color = {
data["esp_distance_color"][0].get<int>(),
data["esp_distance_color"][1].get<int>(),
data["esp_distance_color"][2].get<int>()
};
}
//if (data["show_distance"].is_boolean())
// show_distance = data["show_distance"];
//if (data["show_armor"].is_boolean())
// show_armor = data["show_armor"];
//if (data["rainbow"].is_boolean())
// rainbow = data["rainbow"];
//if (data["rainbow_speed"].is_number())
// rainbow_speed = data["rainbow_speed"];
//if (data["head_tracker"].is_boolean())
// head_tracker = data["head_tracker"];
return true;
}
@@ -46,12 +83,20 @@ namespace config {
data["team_esp"] = team_esp;
data["automatic_update"] = automatic_update;
data["render_distance"] = render_distance;
data["show_distance"] = show_distance;
data["show_armor"] = show_armor;
data["rainbow"] = rainbow;
data["rainbow_speed"] = rainbow_speed;
data["head_tracker"] = head_tracker;
data["flag_render_distance"] = flag_render_distance;
data["show_extra_flags"] = show_extra_flags;
data["esp_box_color_team"] = { esp_box_color_team.r, esp_box_color_team.g, esp_box_color_team.b };
data["esp_box_color_enemy"] = { esp_box_color_enemy.r, esp_box_color_enemy.g, esp_box_color_enemy.b };
data["esp_name_color"] = { esp_name_color.r, esp_name_color.g, esp_name_color.b };
data["esp_distance_color"] = { esp_distance_color.r, esp_distance_color.g, esp_distance_color.b };
//data["show_distance"] = show_distance;
//data["show_armor"] = show_armor;
//data["rainbow"] = rainbow;
//data["rainbow_speed"] = rainbow_speed;
//data["head_tracker"] = head_tracker;
std::ofstream output(file_path);
output << std::setw(4) << data << std::endl;
output.close();
+26 -6
View File
@@ -5,6 +5,18 @@
using json = nlohmann::json;
struct RGB {
int r;
int g;
int b;
// Conversion function from RGB to COLORREF
operator COLORREF() const {
return RGB(r, g, b);
}
};
namespace config {
const std::string file_path = "config.json";
@@ -13,10 +25,18 @@ namespace config {
inline bool automatic_update = false;
inline bool team_esp = false;
inline float render_distance = -1.f;
inline bool show_distance = false;
inline bool show_armor = false;
inline bool head_tracker = false;
inline bool rainbow = false;
inline float rainbow_speed = 0.001f;
inline float render_distance = -1.f;
inline int flag_render_distance = 200;
inline bool show_extra_flags = false;
//inline bool show_distance = false;
//inline bool show_armor = false;
//inline bool head_tracker = false;
//inline bool rainbow = false;
//inline float rainbow_speed = 0.001f;
inline RGB esp_box_color_team = { 75, 175, 75 };
inline RGB esp_box_color_enemy = { 175, 75, 75 };
inline RGB esp_name_color = { 75, 75, 175 };
inline RGB esp_distance_color = { 75, 75, 175 };
}
+8
View File
@@ -99,6 +99,14 @@ struct Vector3
return { x, y, w };
}
float calculate_distance(const Vector3& point) const {
float dx = point.x - x;
float dy = point.y - y;
float dz = point.z - z;
return std::sqrt(dx * dx + dy * dy + dz * dz);
}
// struct data
float x, y, z;
};