finish no smoke and smoke color

Author: avitran0

include/config.hpp

@@ -60,7 +60,7 @@ struct WeaponConfig {
     bool visibility_check = true;
     bool multibone = true;
     bool flash_check = true;
-    
+
     bool rcs = false;
 
     toml::table to_toml() const;
@@ -221,7 +221,7 @@ struct VisualsConfig {
 };
 
 struct MiscConfig {
-    ImVec4 smoke_color;
+    ImVec4 smoke_color = Colors::BLUE;
     f32 max_flash_alpha = 0.0f;
     i32 desired_fov = DEFAULT_FOV;
 

lib/sdl

@@ -221,18 +221,26 @@ VisualsConfig VisualsConfig::from_toml(const toml::table &table) {
 
 toml::table MiscConfig::to_toml() const {
     return toml::table {
+        {"smoke_color", imvec4_to_array(smoke_color)},
         {"max_flash_alpha", max_flash_alpha},
         {"desired_fov", desired_fov},
         {"no_flash", no_flash},
-        {"fov_changer", fov_changer}};
+        {"fov_changer", fov_changer},
+        {"no_smoke", no_smoke},
+        {"change_smoke_color", change_smoke_color}};
 }
 
 MiscConfig MiscConfig::from_toml(const toml::table &table) {
     MiscConfig cfg;
+    if (const auto arr = table["smoke_color"].as_array()) {
+        cfg.smoke_color = array_to_imvec4(*arr);
+    }
     cfg.max_flash_alpha = table["max_flash_alpha"].value_or(cfg.max_flash_alpha);
     cfg.desired_fov = table["desired_fov"].value_or(cfg.desired_fov);
     cfg.no_flash = table["no_flash"].value_or(cfg.no_flash);
     cfg.fov_changer = table["fov_changer"].value_or(cfg.fov_changer);
+    cfg.no_smoke = table["no_smoke"].value_or(cfg.no_smoke);
+    cfg.change_smoke_color = table["change_smoke_color"].value_or(cfg.change_smoke_color);
     return cfg;
 }
 

src/config.cpp

@@ -690,6 +690,10 @@ std::optional<std::string> GetEntityType(const u64 entity) {
 
     std::string entity_name = process.ReadString(name_pointer);
 
+    if (entity_name.compare(0, 5, "smoke") == 0) {
+        return entity_name;
+    }
+
     if (entity_name.compare(0, 7, "weapon_") == 0) {
         return entity_name.erase(0, 7);
     }
@@ -909,11 +913,6 @@ void VisualInfo() {
             continue;
         }
 
-        // is a held weapon
-        if (EntityHasOwner(*entity)) {
-            continue;
-        }
-
         const std::optional<std::string> name = GetEntityType(*entity);
         if (!name) {
             continue;
@@ -924,6 +923,12 @@ void VisualInfo() {
             if (smoke) {
                 smokes.push_back(*smoke);
             }
+            continue;
+        }
+
+        // is held weapon
+        if (EntityHasOwner(*entity)) {
+            continue;
         }
 
         const u64 gs_node = process.Read<u64>(*entity + offsets.pawn.game_scene_node);
@@ -965,7 +970,7 @@ void Run() {
     NoFlash();
     Rcs();
     // todo: smokes
-    // Smokes(smokes);
+    Smokes(smokes);
 
     Aimbot();
     Triggerbot();

src/cs2/cs2.cpp

@@ -25,9 +25,11 @@ void Smoke::Disable() const {
 
 void Smoke::SetColor() const {
     if (config.misc.change_smoke_color) {
-        process.Write(controller + offsets.smoke.smoke_color, config.misc.smoke_color.x);
-        process.Write(controller + offsets.smoke.smoke_color, config.misc.smoke_color.y);
-        process.Write(controller + offsets.smoke.smoke_color, config.misc.smoke_color.z);
+        process.Write(controller + offsets.smoke.smoke_color, config.misc.smoke_color.x * 255.0f);
+        process.Write(
+            controller + offsets.smoke.smoke_color + 4, config.misc.smoke_color.y * 255.0f);
+        process.Write(
+            controller + offsets.smoke.smoke_color + 8, config.misc.smoke_color.z * 255.0f);
     }
 }
 

src/cs2/smoke.cpp

@@ -649,18 +649,28 @@ void Gui() {
 
             ImGui::Checkbox("No Flash", &config.misc.no_flash);
             if (config.misc.no_flash) {
+                ImGui::SetNextItemWidth(sizes.drag_width);
                 ImGui::DragFloat(
                     "Max Flash Alpha", &config.misc.max_flash_alpha, 0.2f, 0.0f, 255.0f, "%.0f");
             }
 
+            ImGui::Checkbox("No Smoke", &config.misc.no_smoke);
+
             ImGui::Checkbox("FOV Changer", &config.misc.fov_changer);
             if (config.misc.fov_changer) {
+                ImGui::SetNextItemWidth(sizes.drag_width);
                 ImGui::DragInt("Desired FOV", &config.misc.desired_fov, 0.2f, 1, 179);
                 if (ImGui::Button("Reset FOV")) {
                     config.misc.desired_fov = DEFAULT_FOV;
                 }
             }
 
+            ImGui::Checkbox("Smoke Color Override", &config.misc.change_smoke_color);
+            if (config.misc.change_smoke_color) {
+                ImGui::ColorEdit3(
+                    "Smoke Color", &config.misc.smoke_color.x, ImGuiColorEditFlags_NoInputs);
+            }
+
             ImGui::EndChild();
         } else if (active_tab == Tab::Misc) {
             ImGui::BeginChild(