modern ui

Author: Jesewe

ChangeLog.md

@@ -1,11 +1,7 @@
 ### Summary
 
-- **Modularization:** The project is divided into logical modules.
+- **Modern Look:** A custom style sheet was added to improve the appearance of the application.
 
-- **Configuration Management:** The settings are loaded from and saved to `%LOCALAPPDATA%\Requests\ItsJesewe\esp_config.json`. The `_update_config` class method ensures that missing keys are added.
+- **Improved Error Handling:** More try/except blocks and error messages help catch and show errors clearly.
 
-- **Error Handling:** If the target game process (`cs2.exe`) is not found or another error occurs during initialization, an error signal is emitted. The GUI then displays a QMessageBox instead of crashing.
-
-- **Global Hotkeys:** The `keyboard` module registers F6 and F7 as global hotkeys to start and stop the overlay even when the application is not active.
-
-- **Enhanced Drawing:** The overlay displays the nickname above the box and a vertical health progress bar whose color changes with health.
+![Downloads](https://img.shields.io/github/downloads/Jesewe/cs2-esp/v1.0.1/total?style=for-the-badge&logo=github&color=D5006D) ![Platforms](https://img.shields.io/badge/platform-Windows-blue?style=for-the-badge&color=D5006D) ![License](https://img.shields.io/github/license/jesewe/cs2-triggerbot?style=for-the-badge&color=D5006D)

README.md

@@ -52,8 +52,8 @@
 
 - **PyMeow Module:**  
   PyMeow is a dependency for overlay drawing.
-  1. Visit the [PyMeow GitHub Releases page](https://github.com/qb-0/pyMeow/releases) and download the latest `pyMeow*.zip` release.
-  2. Install PyMeow using pip:
+  Visit the [PyMeow GitHub Releases page](https://github.com/qb-0/pyMeow/releases) and download the latest `pyMeow*.zip` release.
+  Install PyMeow using pip:
      ```bash
      pip install pyMeow*.zip
      ```

classes/config.py

@@ -3,7 +3,7 @@
 from pyMeow import get_color, fade_color
 
 # Define the current version of the application.
-CURRENT_VERSION = "1.0.0"
+CURRENT_VERSION = "v1.0.1"
 
 # Define the configuration directory and file.
 CONFIG_DIR = os.path.join(os.environ.get("LOCALAPPDATA", "."), "Requests", "ItsJesewe")
@@ -16,6 +16,7 @@
     "box_line_thickness": 1.2,     # Default box line thickness
     "box_color_hex": "#FFA500",    # Default enemy box outline (Orange)
     "text_color_hex": "#FFFFFF",   # Default text color (White)
+    "draw_health_numbers": False,  # Whether to display health numbers
     "use_transliteration": True,   # Whether to use transliteration for player names
     "draw_teammates": False,       # Whether to display ESP for teammates
     "teammate_color_hex": "#00FFFF"  # Default teammate box outline (Cyan)
@@ -28,6 +29,7 @@ def __init__(self):
         self.box_line_thickness = DEFAULT_CONFIG["box_line_thickness"]
         self.box_color_hex = DEFAULT_CONFIG["box_color_hex"]
         self.text_color_hex = DEFAULT_CONFIG["text_color_hex"]
+        self.draw_health_numbers = DEFAULT_CONFIG["draw_health_numbers"]
         self.use_transliteration = DEFAULT_CONFIG["use_transliteration"]
         self.draw_teammates = DEFAULT_CONFIG["draw_teammates"]
         self.teammate_color_hex = DEFAULT_CONFIG["teammate_color_hex"]
@@ -48,6 +50,7 @@ def load(self) -> None:
                 self.box_line_thickness = data.get("box_line_thickness", self.box_line_thickness)
                 self.box_color_hex = data.get("box_color_hex", self.box_color_hex)
                 self.text_color_hex = data.get("text_color_hex", self.text_color_hex)
+                self.draw_health_numbers = data.get("draw_health_numbers", self.draw_health_numbers)
                 self.use_transliteration = data.get("use_transliteration", self.use_transliteration)
                 self.draw_teammates = data.get("draw_teammates", self.draw_teammates)
                 self.teammate_color_hex = data.get("teammate_color_hex", self.teammate_color_hex)
@@ -64,6 +67,7 @@ def save(self) -> None:
                 "box_line_thickness": self.box_line_thickness,
                 "box_color_hex": self.box_color_hex,
                 "text_color_hex": self.text_color_hex,
+                "draw_health_numbers": self.draw_health_numbers,
                 "use_transliteration": self.use_transliteration,
                 "draw_teammates": self.draw_teammates,
                 "teammate_color_hex": self.teammate_color_hex,

classes/cs2esp.py

@@ -1,14 +1,17 @@
+import logging
 import requests
 import pymem
 import pyMeow as overlay
-from typing import Iterator, Optional, Dict, Any
+from typing import Iterator, Optional, Dict
 from classes.utils import read_vec3, read_string, read_floats, transliterate
 from classes.config import Offsets, Colors, overlay_settings
 from PyQt6.QtCore import QObject, pyqtSignal, pyqtSlot
-import logging
 
 logging.basicConfig(level=logging.INFO, format='[%(levelname)s] %(message)s')
 
+# Constants for entity iteration
+ENTITY_COUNT = 64
+ENTITY_ENTRY_SIZE = 120
 
 class Entity:
     """
@@ -28,34 +31,53 @@ def name(self) -> str:
 
     @property
     def health(self) -> int:
-        return self.mem.read_int(self.pawn_ptr + Offsets.m_iHealth)
+        try:
+            return self.mem.read_int(self.pawn_ptr + Offsets.m_iHealth)
+        except Exception as e:
+            logging.error("Failed to read health: %s", e)
+            return 0
 
     @property
     def team(self) -> int:
-        return self.mem.read_int(self.pawn_ptr + Offsets.m_iTeamNum)
+        try:
+            return self.mem.read_int(self.pawn_ptr + Offsets.m_iTeamNum)
+        except Exception as e:
+            logging.error("Failed to read team: %s", e)
+            return -1
 
     @property
     def pos(self) -> Dict[str, float]:
-        return read_vec3(self.mem, self.pawn_ptr + Offsets.m_vOldOrigin)
+        try:
+            return read_vec3(self.mem, self.pawn_ptr + Offsets.m_vOldOrigin)
+        except Exception as e:
+            logging.error("Failed to read position: %s", e)
+            return {"x": 0.0, "y": 0.0, "z": 0.0}
 
     @property
     def dormant(self) -> bool:
-        return bool(self.mem.read_int(self.pawn_ptr + Offsets.m_bDormant))
+        try:
+            return bool(self.mem.read_int(self.pawn_ptr + Offsets.m_bDormant))
+        except Exception as e:
+            logging.error("Failed to read dormant flag: %s", e)
+            return True
 
     def bone_pos(self, bone: int) -> Dict[str, float]:
-        game_scene = self.mem.read_longlong(self.pawn_ptr + Offsets.m_pGameSceneNode)
-        bone_array_ptr = self.mem.read_longlong(game_scene + Offsets.m_pBoneArray)
-        return read_vec3(self.mem, bone_array_ptr + bone * 32)
+        try:
+            game_scene = self.mem.read_longlong(self.pawn_ptr + Offsets.m_pGameSceneNode)
+            bone_array_ptr = self.mem.read_longlong(game_scene + Offsets.m_pBoneArray)
+            return read_vec3(self.mem, bone_array_ptr + bone * 32)
+        except Exception as e:
+            logging.error("Failed to get bone position for bone %d: %s", bone, e)
+            return {"x": 0.0, "y": 0.0, "z": 0.0}
 
     def world_to_screen(self, view_matrix: list) -> bool:
         try:
             self.pos2d = overlay.world_to_screen(view_matrix, self.pos, 1)
             self.head_pos2d = overlay.world_to_screen(view_matrix, self.bone_pos(6), 1)
+            return True
         except Exception as e:
             logging.error("world_to_screen conversion failed: %s", e)
             return False
-        return True
-
 
 class CS2Esp:
     """
@@ -80,32 +102,36 @@ def load_offsets(self) -> None:
         Loads game offsets and field mappings from remote JSON resources.
         """
         try:
-            offsets_url = "https://raw.githubusercontent.com/a2x/cs2-dumper/main/output/offsets.json"
-            with requests.get(offsets_url) as offsets_response:
+            # Use a session for improved performance and timeout handling
+            with requests.Session() as session:
+                offsets_url = "https://raw.githubusercontent.com/a2x/cs2-dumper/main/output/offsets.json"
+                offsets_response = session.get(offsets_url, timeout=10)
                 offsets_response.raise_for_status()
                 offsets_data = offsets_response.json()
-            keys = ["dwViewMatrix", "dwEntityList", "dwLocalPlayerController", "dwLocalPlayerPawn"]
-            for key in keys:
-                setattr(Offsets, key, offsets_data["client.dll"][key])
 
-            client_dll_url = "https://raw.githubusercontent.com/a2x/cs2-dumper/main/output/client_dll.json"
-            with requests.get(client_dll_url) as client_dll_response:
+                # Load required offset keys
+                keys = ["dwViewMatrix", "dwEntityList", "dwLocalPlayerController", "dwLocalPlayerPawn"]
+                for key in keys:
+                    setattr(Offsets, key, offsets_data["client.dll"].get(key))
+
+                client_dll_url = "https://raw.githubusercontent.com/a2x/cs2-dumper/main/output/client_dll.json"
+                client_dll_response = session.get(client_dll_url, timeout=10)
                 client_dll_response.raise_for_status()
                 client_dll_data = client_dll_response.json()
 
-            mapping = {
-                "m_iIDEntIndex": "C_CSPlayerPawnBase",
-                "m_hPlayerPawn": "CCSPlayerController",
-                "m_fFlags": "C_BaseEntity",
-                "m_iszPlayerName": "CBasePlayerController",
-                "m_iHealth": "C_BaseEntity",
-                "m_iTeamNum": "C_BaseEntity",
-                "m_vOldOrigin": "C_BasePlayerPawn",
-                "m_pGameSceneNode": "C_BaseEntity",
-                "m_bDormant": "CGameSceneNode",
-            }
-            for field, cls in mapping.items():
-                setattr(Offsets, field, client_dll_data["client.dll"]["classes"][cls]["fields"][field])
+                mapping = {
+                    "m_iIDEntIndex": "C_CSPlayerPawnBase",
+                    "m_hPlayerPawn": "CCSPlayerController",
+                    "m_fFlags": "C_BaseEntity",
+                    "m_iszPlayerName": "CBasePlayerController",
+                    "m_iHealth": "C_BaseEntity",
+                    "m_iTeamNum": "C_BaseEntity",
+                    "m_vOldOrigin": "C_BasePlayerPawn",
+                    "m_pGameSceneNode": "C_BaseEntity",
+                    "m_bDormant": "CGameSceneNode",
+                }
+                for field, cls in mapping.items():
+                    setattr(Offsets, field, client_dll_data["client.dll"]["classes"][cls]["fields"].get(field))
         except Exception as e:
             raise Exception(f"Error loading offsets: {e}")
 
@@ -120,10 +146,6 @@ def iterate_entities(self) -> Iterator[Entity]:
             logging.error("Error reading entity list or local controller pointer: %s", e)
             return iter([])
 
-        # Constants used for entity list indexing
-        ENTITY_COUNT = 64
-        ENTITY_ENTRY_SIZE = 120
-
         for i in range(1, ENTITY_COUNT + 1):
             try:
                 list_index = (i & 0x7FFF) >> 9
@@ -164,7 +186,7 @@ def draw_entity(self, entity: Entity, view_matrix: list, is_teammate: bool = Fal
                 overlay_settings.teammate_color_hex if is_teammate else overlay_settings.box_color_hex
             )
             text_color = overlay.get_color(overlay_settings.text_color_hex)
-
+            # Optionally draw snaplines
             if overlay_settings.draw_snaplines:
                 screen_width = overlay.get_screen_width()
                 screen_height = overlay.get_screen_height()
@@ -235,6 +257,16 @@ def draw_entity(self, entity: Entity, view_matrix: list, is_teammate: bool = Fal
                 fill_height,
                 fill_color
             )
+            # Optionally draw health numbers
+            if getattr(overlay_settings, 'draw_health_numbers', False):
+                health_text = f"{entity.health}"
+                overlay.draw_text(
+                    health_text,
+                    int(bar_x - 25),
+                    int(bar_y + bar_height / 2 - 5),
+                    10,
+                    text_color
+                )
         except Exception as e:
             logging.error("Error drawing entity: %s", e)
 
@@ -290,7 +322,6 @@ def stop(self) -> None:
         """Stops the overlay loop."""
         self.running = False
 
-
 class OverlayWorker(QObject):
     """
     A Qt worker class for running the CS2 ESP overlay in a separate thread.