feat: darken players when on the lower part of a map

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "radarflow"
-version = "0.2.5"
+version = "0.2.4"
 authors = ["Janek S <development@superyu.xyz"]
 edition = "2021"
 
@@ -8,39 +8,39 @@ edition = "2021"
 
 [dependencies]
 # memory
-memflow = "0.2.3"
+memflow = "0.2.1"
 memflow-native = { git = "https://github.com/memflow/memflow-native" }
 dataview = "1.0.1"
 
 # logging
-log = "0.4.22"
+log = "0.4.21"
-simple_logger = "5.0.0"
+simple_logger = "4.3.3"
 
 # error handling
-anyhow = "1.0.93"
+anyhow = "1.0.81"
 
 # derive stuff
 enum-primitive-derive = "0.3.0"
-num-traits = "0.2.19"
+num-traits = "0.2.18"
-serde = { version = "1.0.215", features = ["derive"] }
+serde = { version = "1.0.197", features = ["derive"] }
-serde_json = "1.0.133"
+serde_json = "1.0.115"
-clap = { version = "4.5.21", features = ["derive", "string"] }
+clap = { version = "4.5.4", features = ["derive", "string"] }
 
 # tokio
 tokio = { version = "1.37.0", features = ["full"] }
 
 # networking
-axum = { version = "0.7.9", features = ["ws"] }
+axum = { version = "0.7.5", features = ["ws"] }
-tower-http = { version = "0.6.2", features = ["fs"] }
+tower-http = { version = "0.5.2", features = ["fs"] }
-tower = "0.5.1"
+tower = "0.4.13"
-local-ip-address = "0.6.3"
+local-ip-address = "0.6.1"
 
 # other
-itertools = "0.13.0"
+itertools = "0.12.1"
 
 
 [build-dependencies]
-reqwest = { version = "0.12.9", features = ["blocking"] }
+reqwest = { version = "0.12.2", features = ["blocking"] }
-serde = { version = "1.0.215", features = ["derive"] }
+serde = { version = "1.0.197", features = ["derive"] }
-serde_json = "1.0.133"
+serde_json = "1.0.115"
-vergen-gitcl = { version = "1.0.0", features = ["build", "cargo", "rustc",] }
+vergen = { version = "8.3.1", features = ["build", "cargo", "git", "gitcl", "rustc", "si"] }

build.rs

@@ -1,7 +1,7 @@
 use std::error::Error;
 
 use serde::{Deserialize, Serialize};
-use vergen_gitcl::{Emitter, GitclBuilder};
+use vergen::EmitBuilder;
 
 #[derive(Clone, Deserialize, Serialize)]
 struct InfoJson {
@@ -36,27 +36,29 @@ fn build_number() -> Result<(), Box<dyn Error>> {
 fn main() -> Result<(), Box<dyn Error>> {
 
     download(
-        "https://raw.githubusercontent.com/a2x/cs2-dumper/refs/heads/main/output/client_dll.rs",
+        "https://raw.githubusercontent.com/a2x/cs2-dumper/main/output/client.dll.rs",
         "./src/dma/cs2dumper/client_mod.rs"
     ).expect("Failed to download build file \"client.dll.rs\"");
 
     download(
-        "https://raw.githubusercontent.com/a2x/cs2-dumper/refs/heads/main/output/offsets.rs",
+        "https://raw.githubusercontent.com/a2x/cs2-dumper/main/output/offsets.rs",
         "./src/dma/cs2dumper/offsets_mod.rs"
     ).expect("Failed to download build file \"offsets.rs\"");
 
     download(
-        "https://raw.githubusercontent.com/a2x/cs2-dumper/refs/heads/main/output/engine2_dll.rs",
+        "https://raw.githubusercontent.com/a2x/cs2-dumper/main/output/engine2.dll.rs",
         "./src/dma/cs2dumper/engine2_mod.rs"
     ).expect("Failed to download build file \"engine2.dll.rs\"");
 
     build_number()?;
 
-    let gitcl = GitclBuilder::all_git()?;
+    EmitBuilder::builder()
-
+        .git_sha(true)
-
+        .git_commit_date()
-    Emitter::new()
+        .cargo_debug()
-        .add_instructions(&gitcl)?
+        .cargo_target_triple()
+        .rustc_semver()
+        .rustc_llvm_version()
         .emit()?;
 
     Ok(())

src/cli.rs

@@ -45,11 +45,7 @@ fn version() -> String {
         avail.join(", ")
     };
 
-    format!(
+    format!(" {pkg_ver} (rev {git_hash})\nCommit Date: {commit_date}\nAvailable Connectors: {avail_cons}")
-        "{pkg_ver} (rev {git_hash})\n\
-        Commit Date: {commit_date}\n\
-        Available Connectors: {avail_cons}\n"
-    )
 }
 
 fn port_in_range(s: &str) -> Result<u16, String> {

src/comms.rs

@@ -16,18 +16,12 @@ pub struct PlayerData {
     has_awp: bool,
 
     #[serde(rename = "isScoped")]
-    is_scoped: bool,
+    is_scoped: bool
-
-    #[serde(rename = "playerName")]
-    player_name: String,
-
-    #[serde(rename = "weaponId")]
-    weapon_id: i16,
 }
 
 impl PlayerData {
-    pub fn new(pos: Vec3, yaw: f32, player_type: PlayerType, has_bomb: bool, has_awp: bool, is_scoped: bool, player_name: String, weapon_id: i16) -> PlayerData {
+    pub fn new(pos: Vec3, yaw: f32, player_type: PlayerType, has_bomb: bool, has_awp: bool, is_scoped: bool) -> PlayerData {
-        PlayerData { pos, yaw, player_type, has_bomb, has_awp, is_scoped, player_name, weapon_id }
+        PlayerData { pos, yaw, player_type, has_bomb, has_awp, is_scoped }
     }
 }
 
@@ -83,13 +77,16 @@ pub struct RadarData {
     #[serde(rename(serialize = "entityData"))]
     player_data: Vec<EntityData>,
 
+    #[serde(rename = "triggerbot_shoot")]
+    triggerbot_shoot: bool,
+
     //#[serde(rename(serialize = "localYaw"))]
     //local_yaw: f32,
 }
 
 impl RadarData {
-    pub fn new(ingame: bool, map_name: String, player_data: Vec<EntityData>, freq: usize, bomb_planted: bool, bomb_cannot_defuse: bool, bomb_defuse_timeleft: f32, bomb_exploded: bool, bomb_being_defused: bool, bomb_defuse_length: f32, bomb_defuse_end: f32) -> RadarData {
+    pub fn new(ingame: bool, map_name: String, player_data: Vec<EntityData>, freq: usize, bomb_planted: bool, bomb_cannot_defuse: bool, bomb_defuse_timeleft: f32, bomb_exploded: bool, bomb_being_defused: bool, bomb_defuse_length: f32, bomb_defuse_end: f32, triggerbot_shoot: bool,) -> RadarData {
-        RadarData { ingame, map_name, player_data, freq, bomb_planted, bomb_can_defuse: bomb_cannot_defuse, bomb_defuse_timeleft, bomb_exploded, bomb_being_defused, bomb_defuse_length, bomb_defuse_end }
+        RadarData { ingame, map_name, player_data, freq, bomb_planted, bomb_can_defuse: bomb_cannot_defuse, bomb_defuse_timeleft, bomb_exploded, bomb_being_defused, bomb_defuse_length, bomb_defuse_end, triggerbot_shoot }
     }
 
     /// Returns empty RadarData, it's also the same data that gets sent to clients when not ingame
@@ -105,7 +102,8 @@ impl RadarData {
             bomb_exploded: false,
             bomb_being_defused: false,
             bomb_defuse_length: 0.0,
-            bomb_defuse_end: 0.0
+            bomb_defuse_end: 0.0,
+            triggerbot_shoot: false,
         }
     }
 }

src/dma/context/mod.rs

@@ -97,7 +97,7 @@ impl DmaCtx {
         let mut team = 0i32;
         let mut clipping_weapon = 0u64;
         let mut is_scoped = 0u8;
-        let mut player_name_ptr = 0u64;
+        let mut crosshair_id = 0u8;
 
         {
             let mut batcher = MemoryViewBatcher::new(&mut self.process);
@@ -107,33 +107,19 @@ impl DmaCtx {
             batcher.read_into(controller + cs2dumper::client::C_BaseEntity::m_iTeamNum, &mut team);
             batcher.read_into(pawn + cs2dumper::client::C_CSPlayerPawnBase::m_pClippingWeapon, &mut clipping_weapon);
             batcher.read_into(pawn + cs2dumper::client::C_CSPlayerPawn::m_bIsScoped, &mut is_scoped);
-            batcher.read_into(controller + cs2dumper::client::CCSPlayerController::m_sSanitizedPlayerName, &mut player_name_ptr);
+            batcher.read_into(pawn + cs2dumper::client::C_CSPlayerPawnBase::m_iIDEntIndex, &mut crosshair_id);
         }
     
-        let player_name = if player_name_ptr != 0 {
-            let mut name_buffer = [0u8; 32];
-            self.process.read_raw_into(player_name_ptr.into(), &mut name_buffer)?;
-
-            let name_len = name_buffer.iter().position(|&c| c == 0).unwrap_or(name_buffer.len());
-            String::from_utf8_lossy(&name_buffer[..name_len]).to_string()
-        } else {
-            match team {
-                2 => format!("T Player"),
-                3 => format!("CT Player"),
-                _ => format!("Unknown Player"),
-            }
-        };
-
         let team = TeamID::from_i32(team);
 
-        let (has_awp, weapon_id) = {
+        let has_awp = {
             let clipping_weapon: Address = clipping_weapon.into();
             let items_def_idx_addr = clipping_weapon + cs2dumper::client::C_EconEntity::m_AttributeManager 
                 + cs2dumper::client::C_AttributeContainer::m_Item + cs2dumper::client::C_EconItemView::m_iItemDefinitionIndex;
     
             let items_def_idx: i16 = self.process.read(items_def_idx_addr)?;
 
-            (items_def_idx == 9, items_def_idx)
+            items_def_idx == 9
         };
 
         Ok(BatchedPlayerData {
@@ -143,8 +129,7 @@ impl DmaCtx {
             health,
             has_awp,
             is_scoped: is_scoped != 0,
-            player_name,
+            crosshair_id
-            weapon_id,
         })
     }
 
@@ -270,6 +255,5 @@ pub struct BatchedPlayerData {
     pub health: u32,
     pub has_awp: bool,
     pub is_scoped: bool,
-    pub player_name: String,
+    pub crosshair_id: u8,
-    pub weapon_id: i16,
 }

src/dma/mod.rs

@@ -165,9 +165,7 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
                             PlayerType::Local,
                             has_bomb,
                             local_data.has_awp,
-                            local_data.is_scoped,
+                            local_data.is_scoped
-                            local_data.player_name,
-                            local_data.weapon_id
                         )
                     )
                 );
@@ -204,9 +202,7 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
                             player_type,
                             has_bomb,
                             player_data.has_awp,
-                            player_data.is_scoped,
+                            player_data.is_scoped
-                            player_data.player_name,
-                            player_data.weapon_id
                         )
                     )
                 );
@@ -224,7 +220,8 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
                 data.bomb_exploded,
                 data.bomb_being_defused,
                 data.bomb_defuse_length,
-                bomb_defuse_end
+                bomb_defuse_end,
+                local_data.crosshair_id != 0 && local_data.crosshair_id != 255
             );
         } else {
             let mut radar = radar_data.write().await;

src/dma/threaddata/mod.rs

@@ -21,7 +21,7 @@ pub struct CsData {
     // Common
     pub local: u64,
     pub local_pawn: u64,
-    // pub is_dead: bool,   // TODO: Why is this here?
+    pub is_dead: bool,
     pub tick_count: i32,
     pub freeze_period: bool,
     pub round_start_count: u8,
@@ -169,7 +169,7 @@ impl CsData {
         {
             // Globals
             let tick_count_addr = (self.globals + 0x40).into();
-            let map_addr = (self.globals + 384).into();
+            let map_addr = (self.globals + 0x188).into();
 
             // Gamerules
             let bomb_dropped_addr = (self.gamerules + cs2dumper::client::C_CSGameRules::m_bBombDropped as u64).into();
@@ -178,7 +178,7 @@ impl CsData {
             let round_start_count_addr = (self.gamerules + cs2dumper::client::C_CSGameRules::m_nRoundStartCount as u64).into();
 
             // Game Entity System
-            let highest_index_addr = (self.game_ent_sys + cs2dumper::offsets::client_dll::dwGameEntitySystem_highestEntityIndex as u64).into();
+            let highest_index_addr = (self.game_ent_sys + cs2dumper::offsets::client_dll::dwGameEntitySystem_getHighestEntityIndex as u64).into();
 
             let mut batcher = ctx.process.batcher();
             batcher.read_into(
@@ -237,7 +237,7 @@ impl CsData {
         }
 
 
-        let map_string = ctx.process.read_utf8_lossy(map_ptr.into(), 32).unwrap_or(String::from("<empty>"));
+        let map_string = ctx.process.read_char_string_n(map_ptr.into(), 32).unwrap_or(String::from("<empty>"));
 
         self.map = map_string;
         self.bomb_dropped = bomb_dropped != 0;

webradar/assets/json/de_nuke.json

@@ -3,5 +3,6 @@
   "pos_y": 2887.0,
   "scale": 7.0,
   "rotate": 0,
-  "zoom": 0.0
+  "zoom": 0.0,
+  "altitude_split": -495
 }

webradar/assets/json/de_vertigo.json

@@ -3,5 +3,6 @@
   "pos_y": 1762.0,
   "scale": 4.0,
   "rotate": 0,
-  "zoom": 0.0
+  "zoom": 0.0,
+  "altitude_split": 11700
 }

webradar/index.html

@@ -18,14 +18,6 @@
                     <input type="checkbox" onclick="toggleStats()" id="statsCheck" name="stats"/>
                     <label for="statsCheck">Stats</label>
                 </div>
-                <div>
-                    <input type="checkbox" onclick="toggleNames()" id="namesCheck" name="names"/>
-                    <label for="namesCheck">Player Names</label>
-                </div>
-                <div>
-                    <input type="checkbox" onclick="toggleGuns()" id="gunsCheck" name="guns"/>
-                    <label for="gunsCheck">Weapons</label>
-                </div>
             </div>
         </div>
         <canvas id="canvas"></canvas>

webradar/script.js

@@ -1,16 +1,16 @@
 // Colors
 const localColor = "#109856"
+const localLowerColor = "#064024"
 const teamColor = "#68a3e5"
+const teamLowerColor = "#2c4969"
 const enemyColor = "#ec040b"
+const enemyLowerColor = "#4f0002"
 const bombColor = "#eda338"
 const textColor = "#d1d1d1"
 
 // Settings
-shouldZoom = false
+shouldZoom = true
-
+drawStats = false
-drawStats = true
-drawNames = true
-drawGuns = true
 
 // Common
 canvas = null
@@ -31,52 +31,6 @@ zoomSet = false
 safetyBound = 50
 boundingRect = null
 
-// Weapon IDs
-const weaponIdMap = {
-    1: "DEAGLE",
-    2: "DUALIES",
-    3: "FIVE-SEVEN",
-    4: "GLOCK",
-    7: "AK-47",
-    8: "AUG",
-    9: "AWP",
-    10: "FAMAS",
-    11: "G3SG1",
-    13: "GALIL",
-    14: "M249",
-    16: "M4A4",
-    17: "MAC-10",
-    19: "P90",
-    23: "MP5",
-    24: "UMP",
-    25: "XM1014",
-    26: "BIZON",
-    27: "MAG-7",
-    28: "NEGEV",
-    29: "SAWED-OFF",
-    30: "TEC-9",
-    31: "ZEUS",
-    32: "P2000",
-    33: "MP7",
-    34: "MP9",
-    35: "NOVA",
-    36: "P250",
-    38: "SCAR-20",
-    39: "SG 553",
-    40: "SCOUT",
-    60: "M4A1-S",
-    61: "USP-S",
-    63: "CZ75",
-    64: "REVOLVER",
-    43: "FLASH",
-    44: "HE",
-    45: "SMOKE",
-    46: "MOLOTOV",
-    47: "DECOY",
-    48: "INCENDIARY",
-    49: "C4",
-    0: "KNIFE"
-};
 // networking
 websocket = null
 if (location.protocol == 'https:') {
@@ -84,11 +38,11 @@ if (location.protocol == 'https:') {
 } else {
     websocketAddr = `ws://${window.location.host}/ws`
 }
-//websocketAddr = "ws://192.168.0.235:8000/ws"
+websocketAddr = "ws://192.168.0.235:8000/ws"
 
 // Util functions
 const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
-const degreesToRadians = (degrees) => degrees * (Math.PI / 180);
+const degreesToRadians = (degrees) => degrees * (Math.PI/180);
 function makeBoundingRect(x1, y1, x2, y2, aspectRatio) {
     const topLeftX = x1;
     const topLeftY = y1;
@@ -141,7 +95,7 @@ function boundingCoordinates(coordinates, boundingRect) {
     const newX = (coordinates.x - boundingRect.x) / xScale;
     const newY = (coordinates.y - boundingRect.y) / yScale;
 
-    return { x: newX, y: newY };
+    return {x: newX, y: newY};
 }
 
 function boundingScale(value, boundingRect) {
@@ -156,114 +110,7 @@ function mapCoordinates(coordinates) {
     offset_x /= map.scale;
     offset_y /= -map.scale;
 
-    return { x: offset_x, y: offset_y }
+    return {x: offset_x, y: offset_y}
-}
-
-function drawPlayerBomb(pos, playerType) {
-    if (!map) return;
-
-    if (zoomSet) {
-        pos = boundingCoordinates(mapCoordinates(pos), boundingRect);
-        textSize = boundingScale(10, boundingRect);
-    } else {
-        pos = mapCoordinates(pos);
-        textSize = 10;
-    }
-
-    const textY = pos.y + (drawNames ? (drawGuns ? 50 : 35) : (drawGuns ? 35 : 20));
-
-    ctx.fillStyle = bombColor;
-
-    ctx.font = `${textSize}px Arial`;
-    ctx.textAlign = "center";
-    ctx.textBaseline = "top";
-
-    ctx.lineWidth = 2;
-    ctx.strokeStyle = "black";
-    ctx.strokeText("[C4]", pos.x, textY);
-    ctx.fillText("[C4]", pos.x, textY);
-}
-
-function drawPlayerName(pos, playerName, playerType, hasAwp, hasBomb) {
-    if (!map) return;
-
-    if (zoomSet) {
-        pos = boundingCoordinates(mapCoordinates(pos), boundingRect);
-        textSize = boundingScale(12, boundingRect);
-    } else {
-        pos = mapCoordinates(pos);
-        textSize = 12;
-    }
-
-    // Always position at the top
-    const textY = pos.y + 20;
-
-    let displayName = playerName;
-    if (playerType === "Local") {
-        displayName = "YOU";
-        ctx.fillStyle = localColor;
-    } else if (playerType === "Team") {
-        ctx.fillStyle = teamColor;
-    } else if (playerType === "Enemy") {
-        ctx.fillStyle = enemyColor;
-    }
-
-    if (hasBomb) {
-        displayName += " [C4]";
-    }
-
-    ctx.font = `${textSize}px Arial`;
-    ctx.textAlign = "center";
-    ctx.textBaseline = "top";
-
-    ctx.lineWidth = 2;
-    ctx.strokeStyle = "black";
-    ctx.strokeText(displayName, pos.x, textY);
-
-    ctx.fillText(displayName, pos.x, textY);
-}
-
-function getWeaponName(weaponId) {
-    if (weaponIdMap[weaponId]) {
-        return weaponIdMap[weaponId];
-    }
-
-    if (weaponId >= 500) {
-        return "KNIFE";
-    }
-
-    return "WEAPON";
-}
-
-function drawPlayerWeapon(pos, playerType, weaponId) {
-    if (!map) return;
-
-    if (zoomSet) {
-        pos = boundingCoordinates(mapCoordinates(pos), boundingRect);
-        textSize = boundingScale(10, boundingRect);
-    } else {
-        pos = mapCoordinates(pos);
-        textSize = 10;
-    }
-
-    const textY = pos.y + (drawNames ? 35 : 20);
-
-    let weaponName = getWeaponName(weaponId);
-
-    if (weaponId === 9) {
-        ctx.fillStyle = "orange";
-    } else {
-        ctx.fillStyle = textColor;
-    }
-
-    ctx.font = `${textSize}px Arial`;
-    ctx.textAlign = "center";
-    ctx.textBaseline = "top";
-
-    ctx.lineWidth = 2;
-    ctx.strokeStyle = "black";
-    ctx.strokeText(`[${weaponName}]`, pos.x, textY);
-    ctx.fillText(`[${weaponName}]`, pos.x, textY);
 }
 
 function render() {
@@ -295,7 +142,8 @@ function render() {
                     maxY = Math.max(maxY, mapCords.y);
                 });
 
-                boundingRect = makeBoundingRect(minX - safetyBound, minY - safetyBound, maxX + safetyBound, maxY + safetyBound, image.width / image.height)
+
+                boundingRect = makeBoundingRect(minX-safetyBound, minY-safetyBound, maxX+safetyBound, maxY+safetyBound, image.width/image.height)
 
                 zoomSet = true
             } else if (zoomSet) {
@@ -309,8 +157,21 @@ function render() {
                     if (data.Bomb !== undefined) {
                         drawBomb(data.Bomb.pos, data.Bomb.isPlanted)
                     } else {
-                        let fillStyle = localColor
+                        let fillStyle = localLowerColor
 
+                        if (map && map.altitude_split && data.Player.pos.z < map.altitude_split) {
+
+                            switch (data.Player.playerType) {
+                                case "Team":
+                                    fillStyle = teamLowerColor
+                                    break;
+    
+                                case "Enemy":
+                                    fillStyle = enemyLowerColor
+                                    break;
+                            }
+                        } else {
+                            fillStyle = localColor
                             switch (data.Player.playerType) {
                                 case "Team":
                                     fillStyle = teamColor
@@ -320,6 +181,7 @@ function render() {
                                     fillStyle = enemyColor
                                     break;
                             }
+                        }
 
                         drawEntity(
                             data.Player.pos,
@@ -330,36 +192,7 @@ function render() {
                             data.Player.hasAwp,
                             data.Player.playerType,
                             data.Player.isScoped
-                        );
+                        )
-
-                        if (drawNames && !data.Player.isDormant) {
-                            drawPlayerName(
-                                data.Player.pos,
-                                data.Player.playerName,
-                                data.Player.playerType,
-                                data.Player.hasAwp,
-                                data.Player.hasBomb
-                            );
-                        }
-
-                        if (drawGuns && !data.Player.isDormant) {
-                            drawPlayerWeapon(
-                                data.Player.pos,
-                                data.Player.playerType,
-                                data.Player.weaponId
-                            );
-                        }
-
-                        if (data.Player.hasBomb && !data.Player.isDormant) {
-                            drawPlayerBomb(
-                                data.Player.pos,
-                                data.Player.playerType
-                            );
-                        }
-
-                        if (drawNames && data.Player.playerName) {
-                            drawPlayerName(data.Player.pos, data.Player.playerName, data.Player.playerType);
-                        }
                     }
                 });
             }
@@ -367,7 +200,7 @@ function render() {
             if (radarData != null) {
                 if (radarData.bombPlanted && !radarData.bombExploded && radarData.bombDefuseTimeleft >= 0) {
 
-                    let maxWidth = 1024 - 128 - 128;
+                    let maxWidth = 1024-128-128;
                     let timeleft = radarData.bombDefuseTimeleft;
     
                     // Base bar
@@ -385,13 +218,13 @@ function render() {
                         ctx.fillStyle = bombColor
                     }
 
-                    ctx.fillRect(130, 18, (maxWidth - 2) * (timeleft / 40), 12)
+                    ctx.fillRect(130, 18, (maxWidth-2) * (timeleft / 40), 12)
 
                     ctx.font = "24px Arial";
                     ctx.textAlign = "center"
                     ctx.textBaseline = "middle"
                     ctx.fillStyle = textColor
-                    ctx.fillText(`${timeleft.toFixed(1)}s`, 1024 / 2, 28 + 24);
+                    ctx.fillText(`${timeleft.toFixed(1)}s`, 1024/2, 28+24); 
                     
                     // Defuse time lines
                     ctx.strokeStyle = "black"
@@ -405,8 +238,8 @@ function render() {
 
                     // Normal defuse
                     ctx.beginPath()
-                    ctx.moveTo(130 + (maxWidth - 2) * (10 / 40), 16)
+                    ctx.moveTo(130 + (maxWidth-2) * (10 / 40), 16)
-                    ctx.lineTo(130 + (maxWidth - 2) * (10 / 40), 32)
+                    ctx.lineTo(130 + (maxWidth-2) * (10 / 40), 32)
                     ctx.stroke()
 
                     // Defuse stamp line
@@ -414,8 +247,8 @@ function render() {
                         console.log(radarData.bombDefuseEnd)
                         ctx.strokeStyle = "green"
                         ctx.beginPath()
-                        ctx.moveTo(130 + (maxWidth - 2) * (radarData.bombDefuseEnd / 40), 16)
+                        ctx.moveTo(130 + (maxWidth-2) * (radarData.bombDefuseEnd / 40), 16)
-                        ctx.lineTo(130 + (maxWidth - 2) * (radarData.bombDefuseEnd / 40), 32)
+                        ctx.lineTo(130 + (maxWidth-2) * (radarData.bombDefuseEnd / 40), 32)
                         ctx.stroke()
                     }
                 }
@@ -427,12 +260,12 @@ function render() {
                 ctx.textAlign = "center"
                 ctx.textBaseline = "middle"
                 ctx.fillStyle = textColor
-                ctx.fillText("Not on a server", 1024 / 2, 1024 / 2);
+                ctx.fillText("Not on a server", 1024/2, 1024/2); 
             } else {
                 ctx.font = "100px Arial";
                 ctx.textAlign = "center"
                 ctx.fillStyle = textColor
-                ctx.fillText("Disconnected", 1024 / 2, 1024 / 2);
+                ctx.fillText("Disconnected", 1024/2, 1024/2); 
             }
         }
 
@@ -474,39 +307,26 @@ function drawBomb(pos, planted) {
 
     if (zoomSet) {
         pos = boundingCoordinates(mapCoordinates(pos), boundingRect)
-        size = boundingScale(8, boundingRect);
+        size = boundingScale(5, boundingRect);
     } else {
         pos = mapCoordinates(pos)
-        size = 8
+        size = 5
     }
 
     ctx.beginPath();
     ctx.arc(pos.x, pos.y, size, 0, 2 * Math.PI);
     ctx.fillStyle = bombColor;
     ctx.fill();
-
-    ctx.lineWidth = 2;
-    ctx.strokeStyle = "black";
-    ctx.stroke();
-
-    ctx.font = size * 1.2 + "px Arial";
-    ctx.textAlign = "center";
-    ctx.textBaseline = "middle";
-    ctx.fillStyle = "white";
-    ctx.fillText("C4", pos.x, pos.y);
-
     ctx.closePath();
 
     if (planted && ((new Date().getTime() / 1000) % 1) > 0.5) {
         ctx.strokeStyle = enemyColor
-        ctx.lineWidth = 3;
+        ctx.lineWidth = 1;
-        ctx.beginPath();
+        ctx.stroke()
-        ctx.arc(pos.x, pos.y, size + 4, 0, 2 * Math.PI);
-        ctx.stroke();
     }
 }
 
-function drawEntity(pos, fillStyle, dormant, hasBomb, yaw, hasAwp, playerType, isScoped, playerName) {
+function drawEntity(pos, fillStyle, dormant, hasBomb, yaw, hasAwp, playerType, isScoped) {
     if (map == null)
         return
 
@@ -559,6 +379,14 @@ function drawEntity(pos, fillStyle, dormant, hasBomb, yaw, hasAwp, playerType, i
             ctx.fill();
         }
 
+        if (hasBomb) {
+            ctx.beginPath();
+            ctx.arc(pos.x, pos.y, circleRadius / 2, 0, 2 * Math.PI);
+            ctx.fillStyle = bombColor;
+            ctx.fill();
+        }
+
+
         ctx.closePath();
 
         // Calculate arrowhead points
@@ -574,9 +402,9 @@ function drawEntity(pos, fillStyle, dormant, hasBomb, yaw, hasAwp, playerType, i
         const arrowCornerY2 = pos.y - distance * Math.sin((yaw + arrowWidth) * (Math.PI / 180))
 
 
-        const cicleYaw = 90 - yaw
+        const cicleYaw = 90-yaw
-        const startAngle = degreesToRadians(cicleYaw - arrowWidth) - Math.PI / 2
+        const startAngle = degreesToRadians(cicleYaw-arrowWidth)-Math.PI/2
-        const endAngle = degreesToRadians(cicleYaw + arrowWidth) - Math.PI / 2
+        const endAngle = degreesToRadians(cicleYaw+arrowWidth)-Math.PI/2
 
         // Draw arrow
 
@@ -691,7 +519,7 @@ function connect() {
             websocket = null
             unloadMap()
 
-            setTimeout(function () {
+            setTimeout(function() {
                 connect();
             }, 1000);
         };
@@ -709,10 +537,8 @@ function connect() {
 }
 
 addEventListener("DOMContentLoaded", (e) => {
-    document.getElementById("zoomCheck").checked = false;
+    document.getElementById("zoomCheck").checked = true;
-    document.getElementById("statsCheck").checked = true;
+
-    document.getElementById("namesCheck").checked = true;
-    document.getElementById("gunsCheck").checked = true;
 
     canvas = document.getElementById('canvas');
     canvas.width = 1024;
@@ -731,11 +557,3 @@ function toggleZoom() {
 function toggleStats() {
     drawStats = !drawStats
 }
-
-function toggleNames() {
-    drawNames = !drawNames
-}
-
-function toggleGuns() {
-    drawGuns = !drawGuns
-}

webradar/styles.css

@@ -6,9 +6,6 @@ body {
     align-items: center;
     height: 100vh;
     background-color: #000000; /* Change the background color as needed */
-    background-image: url('assets/image/background.png');
-    background-repeat: repeat;
-    background-size: 128px 128px;
 }
 
 #canvasContainer {
@@ -26,27 +23,12 @@ canvas {
 }
 
 #settingsHolder {
-    visibility: visible;
+    visibility: hidden;
-    position: fixed;
+    position: absolute;
-    top: 50%;
+    top: inherit;
-    left: 0;
+    left: inherit;
-    transform: translateY(-50%);
+    width: inherit;
-    width: auto;
+    height: 20%;
-    height: auto;
-    z-index: 100;
-}
-
-#settingsHolder .settings {
-    display: flex;
-    flex-direction: column;
-    font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-    color: white;
-    visibility: visible;
-    opacity: 0.8;
-    padding: 10px;
-    background-color: rgba(25, 25, 25, 0.7);
-    border-radius: 5px;
-    transition: opacity 0.3s ease;
 }
 
 #settingsHolder:hover .settings {