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

src/comms.rs

@@ -77,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 {
-        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 }
+    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, triggerbot_shoot }
     }
 
     /// Returns empty RadarData, it's also the same data that gets sent to clients when not ingame
@@ -99,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,6 +97,7 @@ impl DmaCtx {
         let mut team = 0i32;
         let mut clipping_weapon = 0u64;
         let mut is_scoped = 0u8;
+        let mut crosshair_id = 0u8;
 
         {
             let mut batcher = MemoryViewBatcher::new(&mut self.process);
@@ -106,6 +107,7 @@ 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(pawn + cs2dumper::client::C_CSPlayerPawnBase::m_iIDEntIndex, &mut crosshair_id);
         }
     
         let team = TeamID::from_i32(team);
@@ -126,7 +128,8 @@ impl DmaCtx {
             team,
             health,
             has_awp,
-            is_scoped: is_scoped != 0
+            is_scoped: is_scoped != 0,
+            crosshair_id
         })
     }
 
@@ -252,4 +255,5 @@ pub struct BatchedPlayerData {
     pub health: u32,
     pub has_awp: bool,
     pub is_scoped: bool,
+    pub crosshair_id: u8,
 }

src/dma/mod.rs

@@ -220,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;

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/script.js

@@ -1,7 +1,10 @@
 // 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"
 
@@ -35,7 +38,7 @@ 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);
@@ -154,16 +157,30 @@ function render() {
                     if (data.Bomb !== undefined) {
                         drawBomb(data.Bomb.pos, data.Bomb.isPlanted)
                     } else {
-                        let fillStyle = localColor
+                        let fillStyle = localLowerColor
 
-                        switch (data.Player.playerType) {
-                            case "Team":
-                                fillStyle = teamColor
-                                break;
+                        if (map && map.altitude_split && data.Player.pos.z < map.altitude_split) {
 
-                            case "Enemy":
-                                fillStyle = enemyColor
-                                break;
+                            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
+                                    break;
+    
+                                case "Enemy":
+                                    fillStyle = enemyColor
+                                    break;
+                            }
                         }
 
                         drawEntity(